commit | eca0b552dd93a3e24fe90f6e0cc014e808daffb8 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:27 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:18:27 2012 -0700 |
tree | 2b2ac303f43960e4b0aa2e2c82aaa9cd4854bbb2 | |
parent | 595b9ea54a21988ae4209779ac2dae9898aa43e2 [diff] | |
parent | 5b2a5cfed8e7885890c62840bd58f60ff80c17b2 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ib69160e84d0803f668e62c9425a0b4e6480ab77b