tree afcafd39b37bc65f5d644167c10671150ad7886a
parent 639f24429cbc0024f7b78f32400337ac79b8c30d
parent 2ac99aae71893537a52485b98d62ebf70e1af1a3
author Logan Chien <loganchien@google.com> 1499418277 +0000
committer android-build-merger <android-build-merger@google.com> 1499418277 +0000

Merge "Merge "Merge changes Iea55330d,I547319f2 am: 7369c92fbc am: 6bf19f7c77" into oc-dev-plus-aosp am: cefbb705d2" into oc-dr1-dev-plus-aosp
am: 2ac99aae71

Change-Id: I4ddabaa8e1874e3aaf960012df6f2455e6628943