Merge "Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev am: 28d9ef8112 am: 4da0296e23" into nyc-mr1-dev-plus-aosp
am: f95106e926
* commit 'f95106e926e668511205137ba4d93cf018196993':
Change-Id: I49e655a09e5e5b1e96bf870e96bb8a3013d03fd3
This commit is contained in: