| commit | 2c169b5fde4b10c59c4fa8a4d9fd434a07fe749e | [log] [tgz] |
|---|---|---|
| author | Jérôme Poichet <jpoichet@google.com> | Thu May 29 09:43:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 29 09:43:42 2014 +0000 |
| tree | 0005b2d6e4e9697cc9e07cbedf43561ae843445c | |
| parent | 7e959e77236638d7d7cf4465941e2dd1a834b185 [diff] | |
| parent | 2ad1027496fefed641f91f3cde2f8c8b468bca0c [diff] |
am 2ad10274: (-s ours) DO NOT MERGE Retroactive feedback * commit '2ad1027496fefed641f91f3cde2f8c8b468bca0c': DO NOT MERGE Retroactive feedback