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:31:30 +0000 (18:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 18:31:30 +0000 (18:31 +0000)
commit86c579678ee614cf3dd744b42bbd46c772688f46
treed14fc801dbda89284e64c03fde885f7be913785c
parent98f62d8aa05479221ec0f35513cfac62a115922f
parent74b8c15d2b066cd5f2821eb0ddba839b1741349e
Merge "DO NOT MERGE ANYWHERE: Move content from verison 123 to 122, and skip verison 123." into cw-f-dev am: 5b84ba3b15  -s ours
am: 74b8c15d2b  -s ours

Change-Id: I8f4523d90480e3b56bf223468ba42157fe6e97eb