Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev...
Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a am: 19ad9f3f" into nyc-mr1-dev-plus-aosp
am: baeb17e3
* commit 'baeb17e3':
Change-Id: Ibbfec334724f83039853bc43ea9b25d9a53cc987