| commit | ba22290197a6d5f462b6e181515303c4ea4a3280 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 18 14:34:41 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 18 14:34:41 2013 -0700 |
| tree | c9ac3f1e93fe7cb44d33a9b0913dff0e2953c9d1 | |
| parent | e69c2998bebbe2bf8e9f01ca6e644fd41c7914ec [diff] | |
| parent | a6ca7a957bc6446a014d5386f63ab3db668de04b [diff] |
resolved conflicts for merge of a6ca7a95 to stage-aosp-master Change-Id: Icc74574f5e99d9b2076b3a1ae0136f8fdf944ee5