OSDN Git Service

Merge "Strings for post-upgrade." into nyc-dev
authorJeff Sharkey <jsharkey@android.com>
Mon, 25 Apr 2016 17:16:46 +0000 (17:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:16:46 +0000 (17:16 +0000)
commit75173e4aa35dfbf2448377f2dedd901e3cade068
tree82103e658dd7696c4c66718a1b4d6473fb901be1
parent4b49c7a1835c73d1be746b134c2a42bc94c8f46b
parent5dc3304531b7612f1181e122a66eaf097339ae30
Merge "Strings for post-upgrade." into nyc-dev
am: 5dc3304

* commit '5dc3304531b7612f1181e122a66eaf097339ae30':
  Strings for post-upgrade.

Change-Id: I49394c727f6d5bfbed43dea1de9c40031c379b02