commit | e4c22cb38a1a4803f70037a1637c8ca26d60bd89 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:56:43 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 11 05:56:43 2012 -0700 |
tree | 15c7abb41d8c5f42e08401f397c69cdbd52b4232 | |
parent | 5a708879a8f3be84376bc6c444442d37d6585d13 [diff] | |
parent | bc1e541fcff15576e0dbac61a6368558bc5e8e80 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic024d25bb6750ddb85556f5e12f407eaee40086e