| commit | a020bf809049111a6865087d7a8a45627c85b1dc | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 09 07:35:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 07:35:37 2012 -0700 |
| tree | 037c970b42d0ef9b1ea7070dd24cbcd20b97751c | |
| parent | 6fccd6711ddaf85da9fd9df292b75146ee2fffee [diff] | |
| parent | 327999d997857157e09c1cece3fba8b05309b569 [diff] |
am 327999d9: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '327999d997857157e09c1cece3fba8b05309b569':