commit | 64ed24148d570f5a1c8ebeb2f0336b24ecc95b9c | [log] [tgz] |
---|---|---|
author | Andre Eisenbach <andre@broadcom.com> | Thu Mar 20 16:24:10 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 16:24:10 2014 +0000 |
tree | 509a2f83af7b3a5be42072848ab1c63d0985bdd8 | |
parent | 593b6b9d001a184247a7ef1754bc0e52b419a4f2 [diff] | |
parent | 670209545cbf585165029d8866972ade111785c5 [diff] |
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