OSDN Git Service

resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a
authorPavlin Radoslavov <pavlin@google.com>
Wed, 15 Mar 2017 05:53:21 +0000 (05:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Mar 2017 05:53:21 +0000 (05:53 +0000)
commit0796aaa0475fe46c5206210da790ae1cdd23b5c5
treecac93a8834e7144c0757f4b8a400328c76f8ea48
parent718b632f2bd175e9339e2cbd74dd025e96b80b64
parentd4f1f0e048068c77ff557ec89d949f3692c9a7a2
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a
am: d4f1f0e048

Change-Id: Id111ef66d83a3427ccc8272115ef3191221ee3cc