| commit | ac7778e1ce21547b648bd97ac150bab07caab845 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue May 20 00:23:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 20 00:23:12 2014 +0000 |
| tree | b200a53c09ef9b0ef1627f7bb85eb56c4284b813 | |
| parent | 28f4bdaa390c6da134b1afbed69f8a215346eada [diff] | |
| parent | 9e69a2e8ccccae557e40145bbe15a438dc3f336d [diff] |
am 9e69a2e8: am 898f8053: am 05b37cfc: Merge "Revert "Removes bionic\'s dependence on stlport"" * commit '9e69a2e8ccccae557e40145bbe15a438dc3f336d': Revert "Removes bionic's dependence on stlport"