| commit | f28be6e1ed2065cf45cab2996c3f561754bd64c9 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Jul 27 17:55:16 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Jul 27 17:55:16 2011 -0700 |
| tree | 17bef951c9d36768424e1ee4fa2c06b37c1b0610 | |
| parent | 49ab102082b2758bc02a92b7cf8b2db3fab1bcf1 [diff] | |
| parent | d384f817dfa3b356b45c33e2572633ef5df7d598 [diff] |
Merge commit 'd384f817' into manualmerge Conflicts: apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java Change-Id: I73476a374652a478aafd2a16e7b633110276aa9c