OSDN Git Service

resolve merge conflicts of 1fe8749 to nyc-mr1-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Tue, 4 Oct 2016 02:49:53 +0000 (02:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 02:49:53 +0000 (02:49 +0000)
commit419d30ba33c3ef5c2a3b0a7b47ba750635ed2a80
tree98133eeeb0e10e60cb382cb4634fa77f5a771654
parentc7091dd0d47d0fe879371bde11d2fb25f05e15ce
parent6b8d4dfcf8bc100a41325bf85d1912ca61036d4d
resolve merge conflicts of 1fe8749 to nyc-mr1-dev-plus-aosp
am: 6b8d4dfcf8

Change-Id: Iedcd0aabace137b8e3283e27e9f3618df91eec79