commit | b564d4dc3d4b1ea08861bbd22d96d14f9c233a88 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 18:56:03 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 16 18:56:03 2012 -0700 |
tree | 9c6313c1e857098a23ef739f001278d50a972fb6 | |
parent | acaed9952a2a09417dd9e89b9ecaf5aada6e742f [diff] | |
parent | cf23583a09d22bc7223b04ffb53c4f19edb6b6ea [diff] |
Reconcile with jb-mr0-release - do not merge Change-Id: I21ed05b3d6a9679c46a8383e4d53387d16fb5708