| commit | ef1f949dd148723c7de4ce67763b2b526a389dca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 15 07:43:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 15 07:43:17 2012 -0700 |
| tree | 18726a22268df3533dd5cba83e99482522e828e6 | |
| parent | 15260347b84e315bb7f8b933f37f090287dcbc15 [diff] | |
| parent | 8280f93403bfd5d5e24ebfb969f22e2e5d36f85e [diff] |
am 8280f934: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '8280f93403bfd5d5e24ebfb969f22e2e5d36f85e':