tree afb58ce5b8558ff85b30fedb7770ac9dfcaf60db
parent c20f205d1059ff71b21d9c44ea147e209c364d2f
parent fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de
author Dianne Hackborn <hackbod@google.com> 1287620099 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287620099 -0700

am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread

Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.