tree 5b69a3fd9bade803877ab6a8b3d1164502b2b8b9
parent 67b3a9ea61dc627b6c3997632f12d8e13e66f2c8
parent 27284da88c4552c5be4c8eff8acd36b518da47da
author Xia Wang <xiaw@google.com> 1331251260 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1331251260 -0800

Merge "Fix CM test http://b/issue?id=6125619"