commit | 3d646745f76f1f39c295d0da9d17419c237ae186 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:42 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:42 2012 -0700 |
tree | 077354a2b285cb0ffad255d3f08a2ff69c013594 | |
parent | a1e1799a082283f960dafa376ae83880b3b5bf2e [diff] | |
parent | 76a5077f78c062c53bbfa83e6d6e94c1e0e88489 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I6ad917dd332cd6677d124b08197e1686e66e0fca