Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634
authorXin Li <delphij@google.com>
Thu, 16 Jun 2016 14:55:14 +0000 (14:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 14:55:14 +0000 (14:55 +0000)
commit82d89acd57edc838830949c6ea8a6f427ad94595
tree8ae62d9e2ce600b298dc181dc810d56965f99dc5
parent1e32ac3eabdf103151047792ed2d15283919cc44
parente1fb5fe7dfe5f5a61b37d182f199ce858aef9187
Merge goog/master@c8da37c into stage-aosp- am: 38365a1634
am: e1fb5fe7df

Change-Id: I66862093415ec3e74c8852a42da34c6517c839fb