OSDN Git Service

Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev
authorBen Lin <linben@google.com>
Wed, 21 Sep 2016 22:34:52 +0000 (22:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 21 Sep 2016 22:34:54 +0000 (22:34 +0000)
commitba0ee69a15a6207858a72f5fe8ba86953b16641e
treedc47165cf1047cde20f95887ee3e971282d5f35e
parentbe2db1ef7213439ae6e08ac05c24ebb56fdf41e6
parent5e1e779098b4aa4bb6e8587f8b82651d84356a93
Merge "DO NOT MERGE ANYWHERE" into nyc-mr1-dev