| commit | e579958e07673b5537bafe68b185c9a453c8d48a | [log] [tgz] |
|---|---|---|
| author | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 18 11:20:43 2013 -0700 |
| committer | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 18 11:20:43 2013 -0700 |
| tree | 5648110452ccf61d43a2ec395f48f9fa77786160 | |
| parent | e43eb7ca65c8ddf2c48f5dd2225adcb65ebbe356 [diff] | |
| parent | 0aaa120b303f119a86d7f46e3a9c3bd7ee7c08e6 [diff] |
resolved conflicts for merge of 0aaa120b to jb-ub-mail-ur10 Change-Id: I1ca2d361f2cf9836b1c3aa43e5313593ac285f12