resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a
authorPyry Haulos <phaulos@google.com>
Tue, 13 Sep 2016 18:07:48 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Sep 2016 18:07:48 +0000 (18:07 +0000)
commitd5dbe5eec13014563762aa8672441ece0114678f
treeb3b5b918ef6d9a2a34665ce3b464fff6bc3d9ac8
parent7c0f9f16e2face6d59da3c4d179eba8f07b01321
parenteeb08c7a18ff867229277efd956002c8033b28cc
resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a
am: eeb08c7a18

Change-Id: I9d948105b5a8c37ec3d178011e4846861b873c52