OSDN Git Service

Merge commit '3609371c949ec3c31fc88bb6a2231774fdeb25c1' into manual_merge_3609371...
authorJosh Gao <jmgao@google.com>
Thu, 11 Aug 2016 01:41:19 +0000 (01:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 11 Aug 2016 01:41:19 +0000 (01:41 +0000)
am: 75e8b08479

Change-Id: Id59ca38ad1f149f5e1d37e4a41893ab8d3d84f02


Trivial merge