tree 6b9d09150e7df70949af164f78ea56d735320cd5
parent 252756b9c052f41d5c1a5dd1daad7304fcabdb1f
parent d8874bc41898f19be454c76efee1f44126d874d2
author Conley Owens <cco3@android.com> 1333734611 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333734611 -0700

am d8874bc4: Merge "Make 3.82 is ok for ICS and beyond"

* commit 'd8874bc41898f19be454c76efee1f44126d874d2':
  Make 3.82 is ok for ICS and beyond