commit | 672ac17930fa467f0fbe7b6888d3d80e8f16b858 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Dec 21 15:21:29 2016 -0800 |
committer | Xin Li <delphij@google.com> | Thu Dec 22 21:04:36 2016 +0000 |
tree | ff78579e1d03ef095812b437afec2350b3e20eb8 | |
parent | b70b7f8235ef38575467b6bb702be29e9d1024c7 [diff] | |
parent | f26dd88f2fcc6eb694f769fd06f54ad5f2c0d33d [diff] |
DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into nyc-mr1-dev with -s ours. BUG: 33090058 Change-Id: Ife36f0ca09c233bda7aa12a3e5314883789bd78c