tree 62ba2f0ec50ef805f6d3a63afc76c17a76024370
parent f4283c5ba6fdc068070bdee81b673b243db5d98f
parent 1fa4c44c3bc384e9774c9cc1eac9128ad9f01935
author Sundong Ahn <sundongahn@google.com> 1512102619 +0000
committer android-build-merger <android-build-merger@google.com> 1512102619 +0000

Merge changes from topic "system-api" am: 6e4e9f32ec
am: 1fa4c44c3b

Change-Id: I91f2547bc98b6afb73c7b7e0e9844b12a0fcc598