OSDN Git Service

am 67020954: am a4611ac0: DO NOT MERGE: cherrypick from master to fix b/13289050
authorAndre Eisenbach <andre@broadcom.com>
Thu, 20 Mar 2014 16:24:10 +0000 (16:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Mar 2014 16:24:10 +0000 (16:24 +0000)
commit64ed24148d570f5a1c8ebeb2f0336b24ecc95b9c
tree509a2f83af7b3a5be42072848ab1c63d0985bdd8
parent593b6b9d001a184247a7ef1754bc0e52b419a4f2
parent670209545cbf585165029d8866972ade111785c5
am 67020954: am a4611ac0: DO NOT MERGE: cherrypick from master to fix b/13289050

* commit '670209545cbf585165029d8866972ade111785c5':
  DO NOT MERGE: cherrypick from master to fix b/13289050