OSDN Git Service

resolve merge conflicts of e091985bb5b5 to stage-aosp-master
authorJack Yu <jackyu@google.com>
Sat, 25 Feb 2017 04:58:12 +0000 (04:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 25 Feb 2017 04:58:12 +0000 (04:58 +0000)
commit9080d6708da1111499bc8d43c6266dc37be36232
treed3a8f5378b6789d6cdbeb92bd1055b9a27985acb
parent9897cc43699f4c0afe30f9e1f5466e7038a21f58
parent82c46d11f6a84ac34c0fb82ea6845db33e63a439
resolve merge conflicts of e091985bb5b5 to stage-aosp-master
am: 82c46d11f6

Change-Id: I2b6b5f698d03c86957fdaf4f73e26dfe36758924