| commit | 365c42120d1fb71e4f4f62ab466a6878965478bf | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 22 22:47:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 22:47:49 2016 +0000 |
| tree | 04cad3adf253bd56e94bd569bb78b8fbdf1b47eb | |
| parent | 60801ae46ceafd063d572d8733bb6a59ba7291a3 [diff] | |
| parent | 4fd7d842ba776997beac58c9efef7882c46eb5f9 [diff] |
Merge "DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into nyc-mr1-dev with -s ours." into nyc-mr1-dev am: ae2c3a0d9d am: 4fd7d842ba Change-Id: I4bfdcd49b647fa36a0c9ab90143a032ebbf409ef