commit | 1d5cad7eb970c552f802c97cb8c92820b9f07014 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Thu Dec 22 22:37:12 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 22:37:12 2016 +0000 |
tree | ff78579e1d03ef095812b437afec2350b3e20eb8 | |
parent | 55b729c4fc60344ec8ba29c98a88b5bf82b211eb [diff] | |
parent | 672ac17930fa467f0fbe7b6888d3d80e8f16b858 [diff] |
DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into nyc-mr1-dev with -s ours. am: 672ac17930 Change-Id: Idb12dfde6feeabc16907d9df9cf93167d14f036b