tree e7ded7bd9187979bae1279c40c17361912ffe7aa
parent c524d2336022df90786cd627c92e34e5cfba954a
parent 978a6cd08746164ee1f37405d55e0f0bed8f8c24
author Pawin Vongmasa <pawin@google.com> 1468293571 +0000
committer android-build-merger <android-build-merger@google.com> 1468293571 +0000

resolve merge conflicts of 23332cb to nyc-dev
am: 978a6cd087

Change-Id: Ia48baac4feb85234666bcb8f1dca520aee92f729