| commit | 8eb212fba3f253d62d5600b4377d6ee921c2e78e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:52:03 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:52:03 2012 -0800 |
| tree | 91790c221bcdd8cd11c10369e4d463f587b498c3 | |
| parent | fd3e06e52e88b003c532d5f7990acc21aa69612c [diff] | |
| parent | b7a2a7b460359930db3871f9fd8ed37610203ae7 [diff] |
am e3c6084b: (-s ours) am a34f7115: Reconcile with jb-mr1-release - do not merge * commit 'e3c6084bba071f07edf90e36ab02e4f2306ce403':
