OSDN Git Service

Merge commit '59dfbb91' into klp-modular-dev-plus-aosp
authorGriff Hazen <griff@google.com>
Thu, 17 Apr 2014 09:53:18 +0000 (02:53 -0700)
committerGriff Hazen <griff@google.com>
Thu, 17 Apr 2014 09:53:18 +0000 (02:53 -0700)
commit84f4adc9a5e3cc818ed972dc7fecbafb131a779a
treed7fd0bdd9f37b4c82fa7298cb9260928a21b441e
parent2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc
parent59dfbb91ca9c7ef979a9f10e3875f881ed1ef0a5
Merge commit '59dfbb91' into klp-modular-dev-plus-aosp

Remove all changes from the merge to stop propagation.

Conflicts:
tools/layoutlib/bridge/src/android/content/res/AssetManager_Delegate.java