OSDN Git Service

Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison...
authorZheng Zhang <zhzh@google.com>
Thu, 20 Apr 2017 00:16:18 +0000 (00:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Apr 2017 00:16:18 +0000 (00:16 +0000)
am: 89a7e998f1  -s ours

Change-Id: I4784b330048232799eb839cff00ca6e04dab5ecc


Trivial merge