OSDN Git Service

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)
commitc8484abbbde02171023f159491ca342186ae095c
tree7ad5187f36e2770e9647f8304714f185a5fbff90
parent17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a
parent0ae488e1cb64318906397a40d8be4866e81e4860
am 0ae488e1: Merge "Frameworks/base: Use || instead of |"

* commit '0ae488e1cb64318906397a40d8be4866e81e4860':
  Frameworks/base: Use || instead of |