OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e923e1 f33a2f6)
am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 14 May 2014 00:05:38 +0000 (00:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 May 2014 00:05:38 +0000 (00:05 +0000)
* commit 'f33a2f62a54ef966375a7fe8706ce713386d843e':
  Fix build due to incorrect merges [DO NOT MERGE]


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