| commit | 42da895b9061efc6b0abdedc0765deae2ccc2f5e | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Feb 03 18:52:59 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 03 18:52:59 2015 +0000 |
| tree | 19b5899af65636b1d1e42e064abb4f5e105e652a | |
| parent | a9d5d3dbcb3d60847c3995f0eccf1541ab35da49 [diff] | |
| parent | e8bd6d734ccef685c4e25a0ec1735c140b9fe644 [diff] |
Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f automerge: 6112f63 automerge: e8bd6d7 * commit 'e8bd6d734ccef685c4e25a0ec1735c140b9fe644': [ActivityManager] Prevent application holding AMS lock