OSDN Git Service

Merge changes I49c02b92,I898e5cff
authorAlex Light <allight@google.com>
Thu, 13 Apr 2017 01:41:02 +0000 (01:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 13 Apr 2017 01:41:02 +0000 (01:41 +0000)
commit1c62c55ae81f177fe3b684a06274ed6d10a8bbb3
treeca2a6bb4b229c363a3eb1f19e4365f1b3193ff7f
parenta769f6607793abe273ac5ed7bb896d7c0d8f6591
parent687fb792b2a819bb43d45eb720ed68a077ed1beb
Merge changes I49c02b92,I898e5cff
am: 687fb792b2

Change-Id: I78f5b77dead1dfd24582a232187d95fd0addf041