summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-04-28 14:50:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 14:50:00 +0000
commitea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e (patch)
tree3f2a8ebe405dac91ec711c6efc9502539f854ca5 /packages
parent7825b9d01c4721b5d2134c00521d1d92d1799d94 (diff)
parentb268f6064239ca30749e77db86200c4627f0d93a (diff)
downloadframeworks_base-ea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e.zip
frameworks_base-ea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e.tar.gz
frameworks_base-ea07d1cbb4df4257fbff3b3fe66bdf84e2c1ea9e.tar.bz2
am b268f606: (-s ours) am d727677d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b268f6064239ca30749e77db86200c4627f0d93a': Import translations. DO NOT MERGE
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions