OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17eda7d 0ae488e)
am 0ae488e1: Merge "Frameworks/base: Use || instead of |"
authorAndreas Gampe <agampe@google.com>
Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Mar 2015 20:41:04 +0000 (20:41 +0000)
* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |


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