| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Wed Aug 20 17:28:18 2014 -0700 |
| committer | Tor Norbye <tnorbye@google.com> | Wed Aug 20 17:28:18 2014 -0700 |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 [diff] | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 [diff] |
Merge remote-tracking branch 'aosp/upstream-master' into merge Conflicts: .idea/modules.xml platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f