commit | 1630826edbdf92a903a2f16693d12d4b02d17678 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:34 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:34 2012 -0800 |
tree | e1478b6176e8438b5333ae7fc6cdd121b8921c6c | |
parent | 875443d4b56226cf7f4f5155f4c4b6f8293f6f57 [diff] | |
parent | 94592655f56b1b65f21c0511438226d44e77e4b5 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I6bcb489de05ebc91846cec20d8d645e12cc846da