| commit | d49c8c1a3cf58bb6b3fc23f7b6f654e99bdcb180 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Tue Jul 14 19:39:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 19:39:41 2015 +0000 |
| tree | 27cdb77cba300ffc2f098fc3f09af50085e0b6c7 | |
| parent | 03ce0620928ad44c89710fec6e171010218f6b90 [diff] | |
| parent | dc64054818ccc6e35bf92c088c904f8323a394e9 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base