OSDN Git Service

Merge cherrypicks of [2939596, 2938808] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 21 Sep 2017 22:34:47 +0000 (22:34 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 21 Sep 2017 22:34:47 +0000 (22:34 +0000)
commit00ffc33807b052c66db3963ba663aeab762d26e5
treecdfe5c6103442eec8ec5346be5da6686db01276b
parent33951dbf3b214b4f3faaa5a43e13130d059d13f2
parent781be012cbf25942cbe98043e166d76552d3435e
Merge cherrypicks of [29395962938808] into oc-m2-release

Change-Id: I12855e6cbfcc46993ea76d4009cb8d7b4f266b1a