commit | 11dd4b998dfadf5a7eeaec5228cfb6100c855608 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:41:05 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Nov 14 12:41:05 2012 -0800 |
tree | c28bab3111037060f097a01ea4db127678dc1f90 | |
parent | 41f7736ad1e72df8796416a82ce3cede6193d1eb [diff] | |
parent | 2d3d9d11ba12a4f92c1e1787648e8522da617206 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I7915c2abffbc99177c1fec8cf47dfd5c43d88d20