| commit | a372531a6ba3802eccf15dc715c2a93f8ce7f70b | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Wed Aug 12 21:03:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 21:03:26 2015 +0000 |
| tree | e890287ca7b1a14cc65f6f41d0e894f2ab2fee1c | |
| parent | b92e3968b0457b876646c243c39cc03564ea58cf [diff] | |
| parent | 106452119b261cf5099381aecd1f961641712f36 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base