OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0393f4d 5906563)
am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 25 Mar 2015 00:21:20 +0000 (00:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Mar 2015 00:21:20 +0000 (00:21 +0000)
automerge: 5906563  -s ours

* commit '590656314faa267aba787102fd7c673e25710039':
  Fix project settings. [DO NOT MERGE]


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