| commit | d8cf2a50a185f2239c2b9d29e49c7477d4f7dd2a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sat Aug 25 07:18:50 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 25 07:18:50 2012 -0700 |
| tree | 346f106fc9812c5e13a5a04a174f1683ecb437d2 | |
| parent | b7d93138abb431669f25ee2a12e4cac042f27815 [diff] | |
| parent | da0730d81481fb4b4fb0b3262dbe375599d5da44 [diff] |
am da0730d8: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'da0730d81481fb4b4fb0b3262dbe375599d5da44':