tree ea82cc8b146fe310d03a53ad16383ef4acb6a1a8
parent 205d1c34e3289b05700e6caab718de169ad82b90
author Robert Ly <robertly@google.com> 1309976179 -0700
committer Robert Ly <robertly@google.com> 1309980141 -0700

cherrypick from hc-mr1 Change-Id: Ia772e822a703f4b68c76d8c38902ba12faae8052

Change-Id: I57ea8e2ace24a777603513340302265138711590