OSDN Git Service

Merge commit '8fbd15a6d0818916a821bc2138208f0251c9754f' into manual_merge_8fbd15a6d
authorJosh Gao <jmgao@google.com>
Sat, 20 May 2017 06:35:34 +0000 (06:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 20 May 2017 06:35:34 +0000 (06:35 +0000)
commitd61111ff8dd2e32289fffe4e42cd496609952bc0
tree4669421b5a75f0a93f6bf169ae60a13f1c1d5318
parentd2972dbffa9dd309cd7d7125d55ce3232258b837
parentecec45c6819c59f0467d9c39ce60c42f0e14e958
Merge commit '8fbd15a6d0818916a821bc2138208f0251c9754f' into manual_merge_8fbd15a6d
am: ecec45c681

Change-Id: I30f169a1bb30a11c64b404a2ca33defe01fcf6db