| commit | c8484abbbde02171023f159491ca342186ae095c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Mar 17 20:41:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 17 20:41:04 2015 +0000 |
| tree | 7ad5187f36e2770e9647f8304714f185a5fbff90 | |
| parent | 17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a [diff] | |
| parent | 0ae488e1cb64318906397a40d8be4866e81e4860 [diff] |
am 0ae488e1: Merge "Frameworks/base: Use || instead of |" * commit '0ae488e1cb64318906397a40d8be4866e81e4860': Frameworks/base: Use || instead of |