tree 31d5ebe297e3c086acdd491b72b97600318be9ce
parent bf4f010a5b255336584908c661e404f9fce9c9d1
parent 58555ee891ceea7d64203221af59b2e1570d714b
author Paul Stewart <pstew@google.com> 1468974689 +0000
committer android-build-merger <android-build-merger@google.com> 1468974689 +0000

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
am: 58555ee891

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9