diff options
| author | 2016-04-14 14:42:52 +0000 | |
|---|---|---|
| committer | 2016-04-14 14:42:54 +0000 | |
| commit | 8a46d523042ee5d57a743ed216d8fdff7e201e33 (patch) | |
| tree | e33af4902763c1e06f701f935895f70994527f5d /libs/androidfw/AssetManager.cpp | |
| parent | 3af45bd2d06303bfaf8ba28324ca976e6f96ece3 (diff) | |
| parent | d28967f489996d1d74ff5c0bbb9c19d158efbf37 (diff) | |
Merge changes I6b52e378,I1699e6bf into nyc-dev
* changes:
Phone call vibrate should obey user preference.
Adjustment bundles are defusable.
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions