| commit | a14f5265b82bb7da94c5b478044e00e1a3ff6d3f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:08:21 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 08:08:21 2012 -0700 |
| tree | e5fadb2f26899bc340141accfe01cb9fff7cd21c | |
| parent | f45ffab037ff8ea5dc0ee8cd91c554baba77b249 [diff] | |
| parent | 72034c6c5ff3f2114f9ed4dbade58e8fabddad03 [diff] |
am 8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '8616d32f7382563a1aea192e835b2cbbefd9f481':