OSDN Git Service

am 21ba70c2: (-s ours) am 8073625e: Merge remote-tracking branch \'origin/klp-dev...
authorQiwen Zhao <zhao@google.com>
Thu, 5 Dec 2013 22:51:53 +0000 (22:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:51:53 +0000 (22:51 +0000)
commit00cc58010d0918c55831fb093cfddc3e2146937d
tree24bb1aed4a0fafad733bf07baa59fc649658a7bf
parent725b17837da28ff0ec6bee42337234a8d45e33bd
parent21ba70c26659413256882d3e97015bf12477607d
am 21ba70c2: (-s ours) am 8073625e: Merge remote-tracking branch \'origin/klp-dev-plus-aosp\' into klp-dev-plus-aosp

* commit '21ba70c26659413256882d3e97015bf12477607d':