tree f08a01bad8b8347d397a03ce3889b0f29486f627
parent 3bcaeb2eb09da72f0c253bc06f9e406c38457173
parent 2e51799736d5a1bde1b6124192e65f00d09e0a6f
author Glen Kuhne <kuh@google.com> 1470859963 +0000
committer android-build-merger <android-build-merger@google.com> 1470859963 +0000

resolve merge conflicts of b843fca to nyc-dev am: 2709be1ecb
am: 2e51799736

Change-Id: I7eebd8116398f43862dc89b4df76c454d17b6399