tree f04ae29d61fceb2abb23268b754c4dfc80b86c72
parent 76ce30a5555c3b4cac8fda825902910da7f1bc1c
parent bd875da7c7d7569e183e78dd081e56be6bbefad6
author Glen Kuhne <kuh@google.com> 1470867969 +0000
committer android-build-merger <android-build-merger@google.com> 1470867969 +0000

resolve merge conflicts of b843fca to nyc-dev am: 2709be1ecb am: f49876f2c9 am: a37f802e10
am: bd875da7c7

Change-Id: Iab96844fa1565b4c19e5516e2270605d55c08868