| commit | 3195b74751ef25231f6adb1ccba1054dba525e8b | [log] [tgz] |
|---|---|---|
| author | Luan Nguyen <luann@google.com> | Fri Apr 03 22:54:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 03 22:54:37 2015 +0000 |
| tree | 1dbc469d927e88a134652d149bccef78dd0088cb | |
| parent | fd4ffb7d00a4100892e39c2b284ebc5a9345bf0c [diff] | |
| parent | 105295ed5562fe3fd0dec00cfc9b5dbd64440437 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base