| commit | b0cab83b8c962d050fc6a64701f318459f3b7a79 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 12 16:58:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 16:58:53 2012 -0700 |
| tree | 3a528f501f95e5bc492711ade3045c7bc1ef93a2 | |
| parent | fe92291580b8eb2a49c26fb245d3a1e6a7bde494 [diff] | |
| parent | ec2deda6e3a94fa1768a61b5f3c09c042df18a89 [diff] |
am a86c4ad7: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a86c4ad7ea2443e6af75c99038903f78d51d3803':