OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80b6275 e15a587)
am e15a5871: (-s ours) am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAn...
authorYusuke Sato <yusukes@google.com>
Thu, 27 Aug 2015 10:03:33 +0000 (10:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:03:33 +0000 (10:03 +0000)
* commit 'e15a5871bdba6aef1febbf14cdd58864a9e905f9':


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