OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69ab594 3450dc3)
am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 21:23:50 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 21:23:50 +0000 (21:23 +0000)
* commit '3450dc325670cc8e7855c93193cf6f59cf7be430':
  resolve conflicts for merge 5a7b3b65 correctly


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