| commit | 4fe51d3e50835d468e9f16bade4348826030d879 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 22 22:52:52 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 22:52:52 2016 +0000 |
| tree | 1bebff2495a0e141939f88f8499351e1d07ffda9 | |
| parent | 1311d84c80aa1c4e277cf04eb31c102695598915 [diff] | |
| parent | 8cc973c302fc683f3fded407a5801dda3b85d929 [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 am: 8cc973c302 Change-Id: I4d8df40b680a8d7f7936ffcaf78021c13eb380bf