| commit | 6c39111a52512f9c25025c13067629d5117662c4 | [log] [tgz] |
|---|---|---|
| author | Ben Murdoch <benm@google.com> | Tue Sep 30 17:26:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 30 17:26:45 2014 +0000 |
| tree | 5d8ad92694e8f35b0f78436f743009920a2e2393 | |
| parent | 4f0fe1bf6a2fe4e28859bb48dc6e9a155c147d74 [diff] | |
| parent | 34b2dd0a331007d310b2ac57978763327eb9fcce [diff] |
am 34b2dd0a: am cb953816: am aeaacd09: am a1a3dab3: am a1cf4f31: am 109d59bf: Cherry pick r96826. * commit '34b2dd0a331007d310b2ac57978763327eb9fcce': Cherry pick r96826.