| commit | 536a7b24a36033de9b4a8331317ce120d988978f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 19 14:00:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 19 14:00:15 2012 -0800 |
| tree | 73a4607c92d00c87f9c6e059957e8180046afc68 | |
| parent | bda85dddb7dab06926ca95cd1957073e58f6ec98 [diff] | |
| parent | 9cb91beb705bc468028da0cd04471f5f3783d031 [diff] |
am 9cb91beb: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '9cb91beb705bc468028da0cd04471f5f3783d031': JDP80