Tarandeep Singh 66f4e1c3b5 resolve merge conflicts of 9a0d4240dd to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0c20323087f1a2d8eb1ead6cfc60a69e42d2d51b

2017-09-07 11:28:01 -07:00

..

android

resolve merge conflicts of 9a0d4240dd to master

2017-09-07 11:28:01 -07:00

google/android

…