tree 255c3c058ad64593d2b1a815758888d916e3f9df
parent d314805c29fdbee3508b99c14ca63e1a8d170c3b
parent 550e885f47bf454f4a6d5ab5cc322674df6e061f
author Ying Wang <wangying@google.com> 1458956132 +0000
committer android-build-merger <android-build-merger@google.com> 1458956132 +0000

Merge "[DO NOT MERGE] Remove code pulled in by accident."
am: 550e885  -s ours

* commit '550e885f47bf454f4a6d5ab5cc322674df6e061f':
  [DO NOT MERGE] Remove code pulled in by accident.