summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2014-12-01 19:47:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-01 19:47:24 +0000
commit193c7f9b94efb207d8104abdfa81e99576f16b52 (patch)
tree9b47b3a874c0c2848aaecf33614be35ea83eb878 /res
parenteaf7d3bdf1d7b94f3181dfe72ac701d7887c17ad (diff)
parent3509eeca95180fbbef12a4d7ad5b51abd2a9c48d (diff)
am 3509eeca: am 565e33c6: Merge "Telecom API updates (2/6)" into lmp-mr1-dev
* commit '3509eeca95180fbbef12a4d7ad5b51abd2a9c48d': Telecom API updates (2/6)
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions