OSDN Git Service

Merge "Merge commit '999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a...
authorSanket Padawe <sanketpadawe@google.com>
Tue, 28 Mar 2017 18:55:15 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 18:55:15 +0000 (18:55 +0000)
commit1522780586129476588320f57ab914cf8fe3fb1c
treef910d4cba89a6cb91cc06685d7eb1a6ff4f1755a
parent91fc70adaa08f375ca5632645fc9cbdc56e62dab
parent090b311ee5dbb1a78223e667e1c7ec8160ee17f5
Merge "Merge commit '999a6d00244c4b0c2163597ee783739ce7699c5b' into manual_merge_999a6d00244c am: 86a70456a6 am: 46a7204472" into oc-dev-plus-aosp
am: 090b311ee5  -s ours

Change-Id: I0f96c86cfeb8160e079921081c85e681bfaea1eb