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