| commit | 0fb6bf8a15470a18c9489fd3900827c9ef8321ef | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 15:52:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:52:07 2012 -0800 |
| tree | 9d918d438bf7d7e5d3d8657d5b28329703a3e223 | |
| parent | a1c16306b287d95bea161678ff2dbca4866dc73a [diff] | |
| parent | 7487adbbeb9023b358df6dba43d4a05cb746b0fa [diff] |
am 7487adbb: (-s ours) am a1a603bb: am 1785b179: Reconcile with jb-mr1-release - do not merge * commit '7487adbbeb9023b358df6dba43d4a05cb746b0fa':