summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2016-01-11 15:46:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-11 15:46:49 +0000
commit8635657b176ee9f80e8f57a7d1da9278722ff8a0 (patch)
tree1e867f50519efa48471511e4d707d237614a28e2 /libs
parent9f094ac04d55cc3a2da2038cc3f3e46dc472269b (diff)
parent0663959eb73127a49d0a72a70000f3b092adc3e6 (diff)
downloadframeworks_base-8635657b176ee9f80e8f57a7d1da9278722ff8a0.zip
frameworks_base-8635657b176ee9f80e8f57a7d1da9278722ff8a0.tar.gz
frameworks_base-8635657b176ee9f80e8f57a7d1da9278722ff8a0.tar.bz2
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am: 66841a62f1 -s ours am: 73992aee94 -s ours
am: 0663959eb7 -s ours * commit '0663959eb73127a49d0a72a70000f3b092adc3e6': Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions