commit | e8bd6d734ccef685c4e25a0ec1735c140b9fe644 | [log] [tgz] |
---|---|---|
author | Craig Mautner <cmautner@google.com> | Tue Feb 03 18:48:29 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 03 18:48:29 2015 +0000 |
tree | 54f27c88e0e734125759db2f0f92706067bc9df1 | |
parent | c0e9c1d0a405c66e7ec75eb6268f84fe1d466344 [diff] | |
parent | 6112f63369c7ba463c0384c73a4e4c0d45b63918 [diff] |
Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f automerge: 6112f63 * commit '6112f63369c7ba463c0384c73a4e4c0d45b63918': [ActivityManager] Prevent application holding AMS lock