commit | 90976c8493ab9439eb8ddaad30aaa0d171467f43 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 06 09:11:21 2013 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Feb 06 09:11:21 2013 -0800 |
tree | 125cf63bba090526790bea5a613e0bd5432a2709 | |
parent | 0714e37cb7acafbc93f2fac40dbb200cd2a96514 [diff] | |
parent | bd0fd29f8395a87b6a9efdc9ac8d49b101ee824d [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668