tree 31930a291c99fe616059e735ef57023eff11a9c7
parent 04c83d8407cd58da8bfe43d81061e915fb16499d
parent 8f5fbd0165ed6ff9bb32e68957120eff659efb85
author Jean-Luc Brouillet <jeanluc@google.com> 1440672588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672588 +0000

am 8f5fbd01: (-s ours) am b7f05114: Restore missing min and max API.

* commit '8f5fbd0165ed6ff9bb32e68957120eff659efb85':