OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92d46e5 dbb38b3)
am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 25 Mar 2015 00:08:28 +0000 (00:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Mar 2015 00:08:28 +0000 (00:08 +0000)
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
  Fix project settings. [DO NOT MERGE]


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