| commit | 47a0e664b86b3584e294fd326f5c776b73f2e25a | [log] [tgz] |
|---|---|---|
| author | Jeremy Joslin <jjoslin@google.com> | Thu Feb 12 19:40:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 19:40:58 2015 +0000 |
| tree | 4b9829981f69c6da7c0d31a28c76272d27bfbe51 | |
| parent | 549aa2b9b73bbb0188a8c5ba87369cad8a40de6c [diff] | |
| parent | 1084df02ad528d5dc322799c4cc9e1a3300da3a5 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base