commit | 29df52f86c4f6683e4ed847bdbadf0a0bd240869 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 11:20:11 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 11:20:11 2012 -0800 |
tree | 7e7890a72aeb9693086434745f888876392c7eb5 | |
parent | 566cad494d504b60710640d931947cff6aade537 [diff] | |
parent | 97351eb43d413220212e95fe63a1ec29aabb77a6 [diff] |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge Change-Id: I130963155d1be3ddd2b1868b2f2ff0aa55411a19