| commit | ed49288a002369579918cd303eed14d9738b76fb | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed Oct 01 14:14:10 2014 -0700 |
| committer | Wink Saville <wink@google.com> | Wed Oct 01 14:14:10 2014 -0700 |
| tree | 0f99188958ed2db8e7d339b3aa0382f5d3568d8b | |
| parent | 7ed7afb51ec2c415c8de8266ea8d38b9a00cdcd0 [diff] | |
| parent | 62321ab11460fd852449b3f6a2113694e3e04e7a [diff] |
Merge commit '62321ab1' into fix-merge-conflict * commit '62321ab1': Maybe fix issue #17700474: manta: high occurrence of device booted... Conflicts: services/core/java/com/android/server/am/ActivityManagerService.java Change-Id: Ica4d544d11c1f81be793bdb4dea610396b32e946