OSDN Git Service

Merge changes I6badcc6a,I652ac746 am: dfc610e672
authorDavid Turner <digit@google.com>
Fri, 17 Jun 2016 07:58:37 +0000 (07:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 07:58:37 +0000 (07:58 +0000)
commit9e99b28e0b20da78c3c554c2665d7dde23038aac
tree2b58b1965d9eadbe42ab5229dfff46cb0fd33621
parent611c9ce987d6db46445286e3385b8719e80f9d7e
parent07e51c3536f5be496facac0e8f9ad7bf1d695f32
Merge changes I6badcc6a,I652ac746 am: dfc610e672
am: 07e51c3536

Change-Id: I7ef7e559d1219ed2c18110e4bdee80ce3a600f9f