OSDN Git Service

am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 14 May 2014 00:21:36 +0000 (00:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 May 2014 00:21:36 +0000 (00:21 +0000)
commit9916c17e6606607bbadacc4fb113018ecb7fcb41
treebdb0dc3b0d8ae9f43805717ddbefe3d74503593a
parent3a559d56a627687d56dc06cc459ef1e7e6b1cd79
parent472cbad479b0f1361c816a2c0d5accb776fa3841
am 472cbad4: am f57871f7: am 888dad0d: am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

* commit '472cbad479b0f1361c816a2c0d5accb776fa3841':
  Fix build due to incorrect merges [DO NOT MERGE]