tree 5399f4db5db19977decee41b403778c69be19c9e
parent d5286d376b7cfc1a0bd35b3aefe7e8f982a877e8
parent 97e228e903518dd77e88d0e82a6ee9fee6e0c553
author Josh Gao <jmgao@google.com> 1480970142 +0000
committer android-build-merger <android-build-merger@google.com> 1480970142 +0000

Merge changes I9df4d6fa,I841123de
am: 97e228e903

Change-Id: I923d6f507cfba689bc714ce2b8a26aa5ba13a4f9