OSDN Git Service

am 29e74621: resolved conflicts for merge of fb2e3c8d to master
authorJim Miller <jaggies@google.com>
Mon, 27 Jan 2014 18:40:37 +0000 (10:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 18:40:37 +0000 (10:40 -0800)
commit8e879273f46d4c6a739bc3c07cbe4d2484267234
treeee7af806c75caa1fdfd6b5e47eecf45886b71f73
parent027058510b6272ae381f8942a47cfe2d591b5403
parent29e746211878d5204e983ef1fc2812d444052f63
am 29e74621: resolved conflicts for merge of fb2e3c8d to master

* commit '29e746211878d5204e983ef1fc2812d444052f63':
  resolved conflicts for merge of fb2e3c8d to master