tree 5bbc67e5d0e95b72d07017041abaf62e860a456a
parent 7f57c82587eec380d341b3059a9bac210819dde3
parent 1abb2db10c93266a415d76b859bff133ac95d52d
author Adam Powell <adamp@google.com> 1308253366 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308253366 -0700

am 1abb2db1: (-s ours) am 1de571fd: am b0b4bcfc: DO NOT MERGE.  Only impacts SDK.  Integrate from master.

* commit '1abb2db10c93266a415d76b859bff133ac95d52d':
  DO NOT MERGE.  Only impacts SDK.  Integrate from master.