tree 87d0a3f520eeb44621f3668eca41b5b07b19af44
parent 929c7c6c81238d47247771e1e38172dd5ee85bda
parent bc94fb434075e8e17623de2b7e327d6f7e8b4682
author Jaekyun Seok <jaekyun@google.com> 1510106132 +0000
committer android-build-merger <android-build-merger@google.com> 1510106132 +0000

Merge changes from topic "system_default_prop" am: 4cb631f624
am: bc94fb4340

Change-Id: I5fc7527907cce11084151643ce6b6451687faed6