| commit | dd137a85d3e0295989b5b9d1f67ff32027be867d | [log] [tgz] |
|---|---|---|
| author | Svetoslav <svetoslavganov@google.com> | Thu Apr 10 12:48:07 2014 -0700 |
| committer | Svetoslav <svetoslavganov@google.com> | Thu Apr 10 12:48:07 2014 -0700 |
| tree | 328650a01c60ee36afa5e7daa119b1ca7d5d216f | |
| parent | 0c5c18a2be161d3d3f778c348b6830161c637f81 [diff] | |
| parent | 6be2f95202237b7284542e692273d13a5bd26913 [diff] |
resolved conflicts for merge of 6be2f952 to master-lockscreen-dev Conflicts: core/java/android/view/IWindowManager.aidl tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db