commit | 6bdeb4481e3e447d5234426a6c9cc74cbf103bab | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 15:14:08 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 07 15:14:08 2012 -0700 |
tree | f5e250c8294a948f3bf40c231125fe199e4c5e08 | |
parent | aad5e32f6ac517d24fa01b74172cec8085f19bda [diff] | |
parent | fe9a455a24a863eaf96520b761ea284cc3cd15ee [diff] |
am fe9a455a: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'fe9a455a24a863eaf96520b761ea284cc3cd15ee': JZO38