| commit | b4ccad3c03bcb85202dc219de47397d2b433266b | [log] [tgz] |
|---|---|---|
| author | Steve Kondik <shade@chemlab.org> | Sun Nov 18 20:28:04 2012 -0800 |
| committer | Steve Kondik <shade@chemlab.org> | Sun Nov 18 20:28:04 2012 -0800 |
| tree | 051e0b801cfd900b417ae904f31f4987ef9dbb3a | |
| parent | d569bc4396f716a00ec71feced0eea418b296989 [diff] | |
| parent | f893fe7ac10a97edf7cd5b1f3165a4627d32a153 [diff] |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/development into mr1 Conflicts: ide/eclipse/.classpath sdk/plat_tools_source.properties Change-Id: Ic78acd9f9328fa809140af2ce300b2e3ff52499b