OSDN Git Service

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

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

Change-Id: I6ccbf0118dd602cdb94c11085a4c45fb6b248856