tree 3660fa5a2328cb9556e2971e12085f14c40d350f
parent 2a021f99840a53b850b825bf30c9f4b370a806ba
parent b4049e7f248706072071fbf0df8820d3b3cdcbf6
author Eric Laurent <elaurent@google.com> 1296857200 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1296857200 -0800

Merge "Fix issues 3425035 and 3423785." into honeycomb