| commit | ad60891a6ecaf2a5815677b33e96afe7f49ee113 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Thu Jun 12 18:50:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 18:50:02 2014 +0000 |
| tree | 6c4f8d3f342bcfc64b527f80359862b0171eab06 | |
| parent | 56dc9a56f89ac73341a41146ff49db656d0d71ae [diff] | |
| parent | 7c9f5529ea07fda43a68f9b5de204cf2b90d1b61 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base