OSDN Git Service

Merge "Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304 am: 75173e4" into...
authorJeff Sharkey <jsharkey@google.com>
Mon, 25 Apr 2016 17:38:49 +0000 (17:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 17:38:49 +0000 (17:38 +0000)
commitcf4b84851c55d72794288f7658eaa78a86f1a1ef
treea53ccc683ef1a7d65e368c377993683e6ecfaf96
parent26440e3fa9eed26454468856bdfde3cb1275b757
parente0ebbaaae27263f9c48f8a7d4ea5ec7c8ba9202f
Merge "Merge "Strings for post-upgrade." into nyc-dev am: 5dc3304 am: 75173e4" into nyc-mr1-dev-plus-aosp
am: e0ebbaa

* commit 'e0ebbaaae27263f9c48f8a7d4ea5ec7c8ba9202f':

Change-Id: I621e54f39d03f0a79d68ec2d9ae238fda2486792