OSDN Git Service

am 9941a289: Merge "am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35...
authorChristopher Tate <ctate@google.com>
Thu, 6 Mar 2014 18:27:41 +0000 (10:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Mar 2014 18:27:41 +0000 (10:27 -0800)
commit2b20e4c2e6bbc60953a2864c031bd2a681e82eb4
treefaefd0b63833d2c23e4704433a43785bbc241048
parent3e107f16030e6600331996a063b0ba71ada4114e
parent9941a289b7fc282f4c0102c178a6e4c501d039c6
am 9941a289: Merge "am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev"

* commit '9941a289b7fc282f4c0102c178a6e4c501d039c6':
  am 777b8a80: am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev