commit | f1b6fd1ac1e969661d5f36afa3d8cbf1d7b9d1a0 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:04:46 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:04:46 2012 -0700 |
tree | 6213b78049605d83cf73f53ea202314163cedb94 | |
parent | 9ad6a1c512bf0280c9db9e6f3f5b575fa9acf768 [diff] | |
parent | ede8e5d1878b087ced35d3ed5655dbca887f74fb [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I29796fbc293247f4891a12b4277b33fcbe733312