| commit | 346210ec96a397f65272dd5c0e3fff1ce05efedc | [log] [tgz] |
|---|---|---|
| author | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 18 11:11:28 2013 -0700 |
| committer | Andrew Sapperstein <asapperstein@google.com> | Tue Jun 18 11:11:28 2013 -0700 |
| tree | 25a70b3b581cccd95284f0787081de0b0c94af1d | |
| parent | da954c000080442f655ce250b3780d1bf249f024 [diff] | |
| parent | bd99f34bb74e82ba809e3707cd7b658ece46d18b [diff] |
resolved conflicts for merge of bd99f34b to jb-ub-mail-ur10 Change-Id: Ia76a1397fbdea305dec6ece9f03b9fc5450c6f67