OSDN Git Service

Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
authorZheng Zhang <zhzh@google.com>
Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 18:26:33 +0000 (18:26 +0000)
am: 5b84ba3b15  -s ours

Change-Id: Ic447d9ee4910f467e8ca6dad7d02693846e4fab8


Trivial merge