OSDN Git Service

Merge changes I2ce11db5,Idba8278b
authorColin Cross <ccross@android.com>
Fri, 30 Sep 2016 20:09:27 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 20:09:27 +0000 (20:09 +0000)
commit198134666ba7ed3c286185f6f0618d322f203fcf
tree6f931284deee96902d25bb63ff53e3896e89ef1c
parent6b2749643f208452bb776f0bfa1456b2e795a9d7
parentdd3f8634998c50035b7c2beb118c00415b29df31
Merge changes I2ce11db5,Idba8278b
am: dd3f863499

Change-Id: I811fb4b61aed0ee6324b48aff2a8b3dfa4581b86