OSDN Git Service

am d4bc9ef8: Merge "Remove duplicate definitions of MIN and MAX."
authorElliott Hughes <enh@google.com>
Mon, 17 Feb 2014 19:05:00 +0000 (19:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Feb 2014 19:05:00 +0000 (19:05 +0000)
commit447d5655498f1dc2a20269e252fd0442d78b4ff2
tree80981a799b4bcd402c77397c538c9368266453c8
parent9e8ee4dd6ae56ee541a2c858039e29314a6923d6
parentd4bc9ef83b36916d5e63c4c3e4a092381473ea52
am d4bc9ef8: Merge "Remove duplicate definitions of MIN and MAX."

* commit 'd4bc9ef83b36916d5e63c4c3e4a092381473ea52':
  Remove duplicate definitions of MIN and MAX.