OSDN Git Service

am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 14 May 2014 00:00:08 +0000 (00:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 May 2014 00:00:08 +0000 (00:00 +0000)
commitf33a2f62a54ef966375a7fe8706ce713386d843e
tree3d152388965b87cab9d901e369e198b681268dcd
parent90d57721692e45fe6259136296e3cd5b669443fc
parentf5af9a4a9a0c0a3bab43235659e3adfa2cebb52f
am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev

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