OSDN Git Service

Merge changes from topic 'cherry-pick'
authorEtan Cohen <etancohen@google.com>
Fri, 30 Sep 2016 20:56:58 +0000 (20:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 20:56:58 +0000 (20:56 +0000)
commit12b48830328c7251013ac076dee863963df03674
tree511a3a28feda77458e20ebdc19fe5707effbddbb
parent083f313756e32187c83210e744023e97f5a66c9f
parente3d5fa1094ecc9edd1c71b002ca4436d327c42eb
Merge changes from topic 'cherry-pick'
am: e3d5fa1094

Change-Id: I73321476de15f230ba19f04a5561238f0567eb9a