| commit | 25652acb8a39e55e0c574f37275cff0a5ca2fe77 | [log] [tgz] |
|---|---|---|
| author | Sharvil Nanavati <sharvil@google.com> | Thu Aug 27 22:09:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 22:09:29 2015 +0000 |
| tree | 09094314f20d95fb61bf2f5525273a8cb072711d | |
| parent | 876a0b3f77e11230580a6db6587e6d21b51a7354 [diff] | |
| parent | ec907e472865f390bc37a79fde932dc19c387fea [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/native