tree 9da182159983cf65c6b60232b8611d909e7e1d9d
parent b82970846b320f780246b2f4877944abeddd4e08
parent 45562df8bbdacd1ca0ce0efa6d11770486920205
author liangweikang <liangweikang@xiaomi.com> 1478835125 +0000
committer android-build-merger <android-build-merger@google.com> 1478835125 +0000

Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" am: 264d1f12a3
am: 45562df8bb

Change-Id: Ibd3818f9b37ee58c6225a9b6d7cefd486f20bdb9