OSDN Git Service

Merge changes I7718b1ba,I648adc35
authorJosh Gao <jmgao@google.com>
Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 19:28:38 +0000 (19:28 +0000)
commitba03502f56c78ece6d37b4a86793808c2fca4afe
tree7e867e21c0d76761a1844d6ab1b00fa3f6e94c67
parentf3a094a4ea54905d713c264b3386a9cd81e164c1
parent4f62c5b3115f98a15595018698ec71baf1746ca4
Merge changes I7718b1ba,I648adc35
am: 4f62c5b311

Change-Id: Ia117c90c75866c0672cbdc0f0fa34975e58b2b0f