commit | 84d8513a5c45fbafce3a2da3a51a438420cea85d | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:02:36 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:02:36 2012 -0700 |
tree | f5e250c8294a948f3bf40c231125fe199e4c5e08 | |
parent | cbe053ce2a930384d8c2dc8dc7b150922d986026 [diff] | |
parent | 113e8569691aa9fab1e19e08d5294ccfdd9f795b [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc