OSDN Git Service

Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304
authorJeff Sharkey <jsharkey@google.com>
Mon, 25 Apr 2016 17:27:09 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:27:09 +0000 (17:27 +0000)
commit29f36909e261b366bc74abd9ee5efef03d72b166
tree74323fee5d95b8ea065807268dadb7ed3d5ad46e
parent9f50bbf7bd0d40132d44761dce1b351485a02c47
parent75173e4aa35dfbf2448377f2dedd901e3cade068
Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304
am: 75173e4

* commit '75173e4aa35dfbf2448377f2dedd901e3cade068':
  Strings for post-upgrade.

Change-Id: Ia69d82a435456477f51af3d96ad3675dcd67b824