commit | 90fc5310e57369e0b47b184cb18c2ec76afe6cca | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:35:26 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:35:26 2012 -0700 |
tree | 31ddea7ddf3e4c0772222f1cf31518553e322d44 | |
parent | b2b0fb506442f721b5ce5b89feda418c1be23a39 [diff] | |
parent | bea82a2d84d0a2c221cf13e9eff15980782d95a7 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I4d3b9f6334bdccf63cbf10caaa83b84180c0ff20