tree b7915045108e4a63ce799adbb70345fb5ec756dc
parent 205d1c34e3289b05700e6caab718de169ad82b90
author Robert Ly <robertly@google.com> 1309999667 -0700
committer Robert Ly <robertly@google.com> 1309999667 -0700

cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8

Change-Id: I763f02a523c7467e7c0241197e8f2652ed7d4f9c