OSDN Git Service

Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into...
authorNarayan Kamath <narayan@google.com>
Fri, 31 Jan 2014 12:33:12 +0000 (12:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 31 Jan 2014 12:33:12 +0000 (12:33 +0000)
commit0ddbc6c215c34f708fcc898be25ddffc18282881
tree565dfac6b18d7398615b0844a7adb060b5649802
parent1fee45f1af82d9dbb2e709413f020b2291205640
parentc1375f6991a79781899fda3c3f9d471654562d3d
Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp