OSDN Git Service

resolve merge conflicts of f36b25c2df to stage-aosp-master
authorMaurice Lam <yukl@google.com>
Mon, 16 Oct 2017 19:22:12 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Oct 2017 19:22:12 +0000 (19:22 +0000)
commit0e1c486e747496d33c58f78f1dd0ea5aa8c179ef
tree354c032142996bb67ff9332858c78fefc938932b
parentf1dc9e65f14d1f9373cdfae8665bb4cbcc2af6ff
parentd4621f630209dd2611b26b493b3f3e5f4a5e1a34
resolve merge conflicts of f36b25c2df to stage-aosp-master
am: d4621f6302

Change-Id: I7f2e89579a99523808138eaabffa917b1e02e3b0