diff options
| author | 2018-02-28 05:14:07 +0000 | |
|---|---|---|
| committer | 2018-02-28 05:14:07 +0000 | |
| commit | 415eae2173bf87521575a5b3d966358f297a3e7d (patch) | |
| tree | 6ebee99473df242489da3436ff747550d310b7f0 /libs/androidfw/AssetManager.cpp | |
| parent | e9113e904628aeef4fe732101c957810a0b2c43d (diff) | |
| parent | 9af710c58756fb75c9b97604b85f8d9000a8c2df (diff) | |
Merge "Don't throw exception if phone process is dead for carrier ID APIs" am: 8c32954906 am: 0713fcf66d
am: 9af710c587 -s ours
Change-Id: I9361259e27ffea1ec358323f57cc4681c7c5e991
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions