| commit | 8ca07337a692d22bf95b118ecd3a29e6bf423fb0 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Tue Jan 06 20:09:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 20:09:28 2015 +0000 |
| tree | 9f2146d7002a6ff71c5a873d2a8696f3d1fa64d0 | |
| parent | 3e50161a6e22fed6709378c65bd1c2c57bdd6a08 [diff] | |
| parent | c985404481d9c81ad77c2ef5ba9a36a52e35429c [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base