tree 90f9921a319459bb16b6088171c3684ee83ad890
parent 804ff964afed8154c5b169cd1f2bb6e89dc05f2f
parent f474056e99de892b731155989ee0d9dae1d3eea7
author Nancy Zheng <nzheng@google.com> 1452730334 +0000
committer android-build-merger <android-build-merger@google.com> 1452730334 +0000

Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1
am: f474056e99

* commit 'f474056e99de892b731155989ee0d9dae1d3eea7':
  Pulling in https://android-review.googlesource.com/#/c/186482/1