summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2013-10-01 14:36:17 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-10-01 14:36:17 -0700
commit7fce50eb7c62f77c77e1890a44075fb3cf979420 (patch)
tree44fcfa950ba14a82611c219af975b7be0e6a5663 /libs/androidfw/ObbFile.cpp
parent32393fd82ad699bc4619e4f7ed4387593f3b5539 (diff)
parentad8ec14f85c4ae7cd7e5c916a7e8d8c1edd2759e (diff)
am ad8ec14f: am 7fb64c6e: Merge "more locale-appropriate screenshot share text"
* commit 'ad8ec14f85c4ae7cd7e5c916a7e8d8c1edd2759e': more locale-appropriate screenshot share text
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions