OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0119a3 4b8e1c6)
am cc4b75b8: resolved conflicts for merge of 73083ed1 to lmp-dev-plus-aosp
authorNarayan Kamath <narayan@google.com>
Wed, 16 Jul 2014 13:09:34 +0000 (13:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Jul 2014 13:09:34 +0000 (13:09 +0000)
* commit 'cc4b75b87a7b38fc2c4c746ef97074b4f2b36280':
  Add an internal API to get all asset locales.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help