| commit | c0381e729692117042c156b85e7d86e90212c40f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:20:16 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:20:16 2012 -0700 |
| tree | f08ac307e4a4813b4ba4293aa3b90ad33e86937c | |
| parent | 4dd5a5d90c2819cec8b7028ea129cbbeff848c80 [diff] | |
| parent | 6f9be30e2f2edbf1b6a0c648327f4628b3dab270 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic915de3d1c13af788c73555bf464a7d2037f9bcf