| commit | 04c83d8407cd58da8bfe43d81061e915fb16499d | [log] [tgz] |
|---|---|---|
| author | Jean-Luc Brouillet <jeanluc@google.com> | Thu Aug 27 10:49:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:49:48 2015 +0000 |
| tree | 31930a291c99fe616059e735ef57023eff11a9c7 | |
| parent | 59442d3713feca18f73e7f3211dafb04098d1d08 [diff] | |
| parent | 6061e1ce1957f8d28eccf4546c34d449e20c4a95 [diff] |
am 6061e1ce: (-s ours) am d515314f: am a73fab60: Merge "Restore missing min and max API." * commit '6061e1ce1957f8d28eccf4546c34d449e20c4a95':