tree 4c64dd5ec4a2d149014ffaf85a0dc34325511698
parent bce007aa754159a3c4b3894c581c53940ebc2e08
parent fc3d3c172756cb1e85b33f221c43c7b8d6a7511b
author Conley Owens <cco3@android.com> 1333727518 -0700
committer android code review <noreply-gerritcodereview@google.com> 1333727518 -0700

Merge "Make 3.82 is ok for ICS and beyond"