tree 24c5731731576500ef25cb41d79d7e1869ee2ba9
parent 6dee58b6d234989509f8c9d7af2cb1de6ebd758d
author Iliyan Malchev <malchev@google.com> 1345793211 -0700
committer The Android Automerger <android-build@android.com> 1345796628 -0700

cherry pick c818e9f72c92ac66fbf636eefb6f314030c25afc: