commit | a4d8f804688deb939a37e5aaf0bab40520548b33 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 07 10:22:19 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 07 10:22:19 2012 -0800 |
tree | af0bb23761cd6539f32ba2b893061cf2226fc059 | |
parent | 7a00ac7cb74e957bed6580cc209f8035cd34f58d [diff] | |
parent | a8540f2ae3b75e41192c49472959d141122dc5f9 [diff] |
am a8540f2a: Reconcile with jb-mr1-release - do not merge * commit 'a8540f2ae3b75e41192c49472959d141122dc5f9':