OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef24a50 d10ca17)
am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:07:45 +0000 (21:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:07:45 +0000 (21:07 +0000)
* commit 'd10ca17d6feefd449595df1cb11d161c8f10dd57':
  resolve conflicts for merge 5a7b3b65 correctly


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