commit | 18f95189727de29246b663ad4557075678217555 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 07:19:26 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 07:19:27 2012 -0800 |
tree | bcd8c9d74216120fe142bd89848b87156abf4852 | |
parent | c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8 [diff] | |
parent | 913f13ef69520bf64bde61006be0b85db8502508 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef