OSDN Git Service

Pulling in https://android-review.googlesource.com/#/c/186482/1 am: 74dfcf90f1
authorNancy Zheng <nzheng@google.com>
Thu, 14 Jan 2016 00:12:14 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jan 2016 00:12:14 +0000 (00:12 +0000)
am: f474056e99

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


Trivial merge