aboutsummaryrefslogtreecommitdiffstats
path: root/java/AndroidManifest.xml
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-03-29 09:54:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-29 09:54:38 -0700
commitc1dec87a76565c5dfa223c7d4d5f10a345ab3799 (patch)
tree71b5d2b21f5bd07dd85de168f5d8c097b44f098d /java/AndroidManifest.xml
parent97a3ce022c4f158712fb803f7acd0151719b336e (diff)
parentb35915fb5095f18554d62dfc148eb1027cefa005 (diff)
downloadlatinime-c1dec87a76565c5dfa223c7d4d5f10a345ab3799.tar.gz
latinime-c1dec87a76565c5dfa223c7d4d5f10a345ab3799.tar.xz
latinime-c1dec87a76565c5dfa223c7d4d5f10a345ab3799.zip
am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'b35915fb5095f18554d62dfc148eb1027cefa005':
Diffstat (limited to 'java/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions