diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:19:21 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:19:21 -0800 |
| commit | 07c8a6d238ddf855d5d6b4421d2527c580a374b6 (patch) | |
| tree | b96b5aeab1276389387d72f2c958dd2d2a99a965 | |
| parent | 3f91534edf98d2a385c8fa29839cdd15a69f21d3 (diff) | |
| parent | d5c3000903dd3e1fd02330d2d3457736ad18d63f (diff) | |
| parent | 80d69a7349b7311e6fd2769a8a2b83d0e573562b (diff) | |
| download | extras-07c8a6d238ddf855d5d6b4421d2527c580a374b6.tar.gz | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I2a69ed763c7b5f29c060d52b41897abd27bc740d