commit | a1a3dab3367a0e1af095e5f57ac671595f365af9 | [log] [tgz] |
---|---|---|
author | Ben Murdoch <benm@google.com> | Tue Sep 30 16:59:29 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 30 16:59:29 2014 +0000 |
tree | b0ac0a50a5a9eee8a2ba28e8bc257abc1c895cc7 | |
parent | 8bd094b8dce7536251c331ce6976b9b5642212af [diff] | |
parent | a1cf4f31e8e5794ff752ef9f72691ecf001abcf1 [diff] |
am a1cf4f31: am 109d59bf: Cherry pick r96826. * commit 'a1cf4f31e8e5794ff752ef9f72691ecf001abcf1': Cherry pick r96826.