| commit | a41474d45c455c98bae9986b626374cb626886ce | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:31 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:19:31 2012 -0800 |
| tree | c7d648319170f36767e0ca6b7e09fc79a09ed0e9 | |
| parent | 879723dd2d89238bdd6c9e126e4c7a4418469c84 [diff] | |
| parent | 7406c32d42db54a0e5ba6950762963334229e027 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I2d8ac7dc080c9f3c400d4a7bde4df1dd892ffba4