OSDN Git Service

Merge changes from topic 'cherry-pick' am: e3d5fa1094
authorEtan Cohen <etancohen@google.com>
Fri, 30 Sep 2016 21:06:24 +0000 (21:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 21:06:24 +0000 (21:06 +0000)
commite8e0ee078914a43db742ad5c717e8ceda55ad48d
treeeeaadb54e30d7643a87ada2a246771d728db748d
parenta06821b2cfd04988c4841d55bb63edcfe4322ac4
parent12b48830328c7251013ac076dee863963df03674
Merge changes from topic 'cherry-pick' am: e3d5fa1094
am: 12b4883032

Change-Id: Icebffbcb4057e278d7b7c42448ac4e626060eaeb