diff options
| author | 2016-07-08 14:44:53 +0000 | |
|---|---|---|
| committer | 2016-07-08 14:44:53 +0000 | |
| commit | 087d33febffdd28d85021800aa42a51b94b64f4a (patch) | |
| tree | 07538727bb758693acce850e62723d795a4a88c1 /libs/androidfw/AssetManager.cpp | |
| parent | 296b9edfb5a4fbeb259566d74d33138b3780a800 (diff) | |
| parent | 33fa5dfa1d0bcd27ac3a2db8ce72f430c5a3204b (diff) | |
Merge \"Making timeouts configurable through Settings\" into nyc-mr1-dev
am: 33fa5dfa1d
Change-Id: Ife69e438d83ddfb75433f92c6c5521ae4c3f82cc
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions