tree 241a29048bb671fa3e437ab3764ee2fdd8daebf5
parent 340db2bafa9b7649a5cadeb2a9c06e451901a8a4
parent 69827524365ae448d19b2089c46534e925cc2bfd
author Roy West <rwest@google.com> 1287708817 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287708817 -0700

am 69827524: Try to fix bug3119318 without breaking the build this time

Merge commit '69827524365ae448d19b2089c46534e925cc2bfd' into gingerbread-plus-aosp

* commit '69827524365ae448d19b2089c46534e925cc2bfd':
  Try to fix bug3119318 without breaking the build this time