tree 31930a291c99fe616059e735ef57023eff11a9c7
parent 59442d3713feca18f73e7f3211dafb04098d1d08
parent 6061e1ce1957f8d28eccf4546c34d449e20c4a95
author Jean-Luc Brouillet <jeanluc@google.com> 1440672588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672588 +0000

am 6061e1ce: (-s ours) am d515314f: am a73fab60: Merge "Restore missing min and max API."

* commit '6061e1ce1957f8d28eccf4546c34d449e20c4a95':