Merge goog/master@c8da37c into stage-aosp-master.
authorMika Isojrvi <misojarvi@google.com>
Thu, 16 Jun 2016 14:51:32 +0000 (14:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 14:51:32 +0000 (14:51 +0000)
commite1fb5fe7dfe5f5a61b37d182f199ce858aef9187
tree8ae62d9e2ce600b298dc181dc810d56965f99dc5
parent45eb53eb43bcfbfd87652914ad86321fc10bf8bd
parent38365a16347bc8b553cb27c585bc8f35a0dae84d
Merge goog/master@c8da37c into stage-aosp-master.
am: 38365a1634

Change-Id: I12f5f85447894cbefcccb3c38737856e6e5afb96