OSDN Git Service

Merge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev
authorEvan Laird <evanlaird@google.com>
Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)
commitf7ce0aac502a3a158c9e6d910842268e1a872329
treef95ccc5fd3af725d11229ad0cad7978cf06e7b65
parent150123dbb7523ac94ae45490dbd9878c9ebb71af
parent423022e8abe2af0374445ca8e2882f62a990b1b4
Merge "resolve merge conflicts of 91870d158748 to oc-dr1-dev" into oc-dr1-dev
am: 423022e8ab

Change-Id: I5f81cfde196fc801c4141c35e708d8f27032c621