| commit | b12eb71c4fd82ac27fb3fe9a86cf9d92e0e511f2 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Nov 12 19:17:06 2013 -0800 |
| committer | Craig Mautner <cmautner@google.com> | Tue Nov 12 19:17:06 2013 -0800 |
| tree | c4d685ad600e90d2dde56aebb379e3997a0ef945 | |
| parent | 764197b14f2c4f1b11939c8913ba707748362950 [diff] | |
| parent | bf581034f9771fd67ea796e91ce28787c33fbb82 [diff] |
Merge commit 'bf581034' into manualmerge Conflicts: tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb