OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fa9569 5f6ae10)
am 5f6ae10b: am a2180eba: (-s ours) am 13bcfdca: am 7a2de061: Merge "Add API for...
authorAlan Viverette <alanv@google.com>
Thu, 5 Dec 2013 22:58:18 +0000 (14:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:58:18 +0000 (14:58 -0800)
* commit '5f6ae10b8c3f1342211ca4b090369dd7f8fd6c3d':


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