commit | e696e53483068dd6bd0aa0ccde42bc1a1b75d336 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:07:03 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:07:03 2012 -0700 |
tree | 174f5b4b49a5a7b3963d3315a4ebd333bc22d4d6 | |
parent | 5d8378c0bad90a7088e38ccb0d537b5d1a5efcdd [diff] | |
parent | 65586bf0b460e3d0217ec8a826fa1c52de03e8f5 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Id59555adc024005fc53103e2006e987e72283811