Merge nougat-mr1-cts-dev into master.
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)
committerXin Li <delphij@google.com>
Thu, 26 Jan 2017 18:55:24 +0000 (10:55 -0800)
commit2dcacdbe0afb28495e92172c9032e69a8af6f4d1
tree4683f4cc440ad2be9e7a58569ecd40a913f5b266
parentb1fa5e8f2c02ab185df72f68c010e89b2c5a0df1
parent6aef236dd0407d8eab330c1eade4375455c00f53
Merge nougat-mr1-cts-dev into master.