OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 930ef7e 0fd337c)
am 0fd337c6: (-s ours) am b9e13a25: Merge "Avoid IllegalStateException when generatin...
authorAlex Klyubin <klyubin@google.com>
Thu, 27 Aug 2015 05:46:06 +0000 (05:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 05:46:06 +0000 (05:46 +0000)
* commit '0fd337c6ece1ce95b4c3d641f1c7625b1d20c47f':


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