| commit | a9f24334aea1822422d1bf52d780fab547749755 | [log] [tgz] |
|---|---|---|
| author | Scott Kennedy <skennedy@google.com> | Tue Apr 23 17:44:33 2013 -0700 |
| committer | Scott Kennedy <skennedy@google.com> | Tue Apr 23 17:44:33 2013 -0700 |
| tree | c37649da2c9ca394443584dd094d08b1f9a1d83b | |
| parent | 8b4345f1a2f8fc815080b25d0da8d60f81bbfa7f [diff] | |
| parent | 26f2b30a88a35bc0ae6992c3f4297ebf20bbca53 [diff] |
resolved conflicts for merge of 26f2b30a to jb-ub-mail-ur9 Change-Id: I01f3477133026e6ec54d41216ef50eacba155060