diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-04-10 12:48:07 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2014-04-10 12:48:07 -0700 |
| commit | dd137a85d3e0295989b5b9d1f67ff32027be867d (patch) | |
| tree | 328650a01c60ee36afa5e7daa119b1ca7d5d216f /docs/html/sdk/api_diff/5/changes | |
| 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
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions