| commit | be473c8fd12955dcb861f330f5f7a4a2a453c8df | [log] [tgz] |
|---|---|---|
| author | Ken Sumrall <ksumrall@android.com> | Wed Nov 28 06:30:14 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 28 06:30:14 2012 -0800 |
| tree | be8df024f0e1a093b175e0cf45f24fe8336814f6 | |
| parent | 690d2052b2d5eb7c471c93aacec4f5e28b42107f [diff] | |
| parent | e659cea645c55fb6ecc744881e288007d53fc9a2 [diff] |
Merge branch 'jb-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp