commit | 4cf143f1c8e7147e696225cc852e532f50115624 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:16:33 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Oct 02 09:16:33 2012 -0700 |
tree | 42e4b8762508ff27010a82ee8b52485b3eded8d9 | |
parent | 15edd80a696c1b5243874f7db9ef2d753016ade8 [diff] | |
parent | f27642c0822ee457b5ab00b2a16c5f1fe70ae141 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I2c724a28984aa03b2887b3db58bd59699b428e85