| commit | 54e3338e9abfbec764d9ee9e8a78e15e7dfaf324 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:42:55 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:42:55 2012 -0700 |
| tree | cccdecf3ef34ac732e354eba8045b5ca63609a96 | |
| parent | 4f591da2ed1696230b8c8a9428b6917332595b70 [diff] | |
| parent | 459fa3f61d1e61a3a09d15574146defdcf2ff15d [diff] |
am 459fa3f6: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '459fa3f61d1e61a3a09d15574146defdcf2ff15d':