tree c9a584f575212ac36525a8331d9dffa61fbc2d39
parent 4c239a4c9e58e797cfa581ba76f98ea9dd5dbc7d
parent 75c45871356ba15f038575c07effede306dc1fe5
author Jean-Luc Brouillet <jeanluc@google.com> 1440126400 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440126400 +0000

am 75c45871: Merge "Restore missing min and max API."

* commit '75c45871356ba15f038575c07effede306dc1fe5':
  Restore missing min and max API.