OSDN Git Service

am 64ed2414: am 67020954: am a4611ac0: DO NOT MERGE: cherrypick from master to fix...
authorAndre Eisenbach <andre@broadcom.com>
Thu, 20 Mar 2014 16:33:51 +0000 (16:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 16:33:51 +0000 (16:33 +0000)
commitc0932fafefc12f8ed8597d404d1392e367ba7136
tree509a2f83af7b3a5be42072848ab1c63d0985bdd8
parenta724ae3347f2c4f8bcccc267cee859ab422cfedc
parent64ed24148d570f5a1c8ebeb2f0336b24ecc95b9c
am 64ed2414: am 67020954: am a4611ac0: DO NOT MERGE: cherrypick from master to fix b/13289050

* commit '64ed24148d570f5a1c8ebeb2f0336b24ecc95b9c':
  DO NOT MERGE: cherrypick from master to fix b/13289050