| commit | 37ead709c672dec125158ecad1cd9b9322803996 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 14:22:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 14:22:27 2012 -0800 |
| tree | 0d462afb1e8127ff92355d9e55c098c5b3898176 | |
| parent | a86ff2d3b746eb935a6a674de43e0b1de17cecdd [diff] | |
| parent | ffa91c3cc04e25ce044b83b58b44a6019491517e [diff] |
am ffa91c3c: Reconcile with jb-mr1-release - do not merge * commit 'ffa91c3cc04e25ce044b83b58b44a6019491517e':