tree c01636b4b6663f090e5261b4f4cb2a479ba4b4c0
parent c223f1ff8f66a205615679192d1db32920f3378d
parent a7b0d087ecb2b59b59f5e69446a3ad512ca9d896
author Android Build Merger (Role) <android-build-merger@google.com> 1499418050 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499418050 +0000

Merge "Merge "Merge changes Iea55330d,I547319f2 am: 7369c92fbc am: 6bf19f7c77" into oc-dev-plus-aosp am: 2974b29bf9" into oc-dr1-dev-plus-aosp