tree 35f3fdf52bbabb78f8a671561852d637f10e014c
parent a8a4d29aecd1eca223245d1db1231707992c9341
parent f4c56a21a389e70b472e4e7e586c7cf59a444f8e
author Nancy Zheng <nzheng@google.com> 1452731000 +0000
committer android-build-merger <android-build-merger@google.com> 1452731000 +0000

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

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