| commit | 72681791764a6364216e2a4f35fbb5ec73900a24 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:19:09 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:19:09 2012 -0700 |
| tree | ee2b2298c8dec2c4f4b506d74b96267f00b25292 | |
| parent | 16e2bf680e19e81b430356748e853a5989d21d45 [diff] | |
| parent | af40b4e5a4778313433ce9612c51ba367acf8d66 [diff] |
am af40b4e5: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'af40b4e5a4778313433ce9612c51ba367acf8d66':