OSDN Git Service

Merge commit '3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371
authorJosh Gao <jmgao@google.com>
Thu, 11 Aug 2016 01:37:50 +0000 (01:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 01:37:50 +0000 (01:37 +0000)
commit75e8b084796e1275e76ea7c312b84366fc69040a
tree1f785a79d25ec39c53934de8f6a030dd1377391b
parent7ffd3546c903b364461265d7258d3146da08f34f
parentcb47e738d98662a4a31d0eeeec722ef476d7669d
Merge commit '3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371
am: cb47e738d9

Change-Id: Ic2f00a437e70f6067fbf3bed3e0d3c08c8c66604