| commit | 3627b4af36717bf1cc3a85dd7a39f0721e023965 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:42:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:42:56 2012 -0700 |
| tree | 7a6fcde317da44077cff3d763f6b2114549e34fa | |
| parent | d5c6a611066ef3bdc8f3729ea222338b3fc11390 [diff] | |
| parent | 9155fe81a9844b78f90f340dad36c106768aae6b [diff] |
am 9155fe81: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '9155fe81a9844b78f90f340dad36c106768aae6b':