tree c9a584f575212ac36525a8331d9dffa61fbc2d39
parent 3cbe8e9b1cde6a25e2ddef34c89817be9de34b84
parent a41555f1f9a2e423d2fa4e901c6d82f573ba08f5
author Jean-Luc Brouillet <jeanluc@google.com> 1440126843 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440126843 +0000

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

* commit 'a41555f1f9a2e423d2fa4e901c6d82f573ba08f5':
  Restore missing min and max API.