| commit | d612ec14226d082d246d8448637d15888733a8b9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:05:21 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 08:05:21 2012 -0700 |
| tree | ef3eadabdd66dd30392c9a451410c5ad3950294c | |
| parent | f1761254147f61f503d0de1627d9c06b40ef861f [diff] | |
| parent | 21da7124dad3e0f78f39d2bbd7b38381c8a1a253 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ibad2e367e7b86df59e5be5c5db6f2165f07fadb9