| commit | 2d77e1e20cda49b5d798650768056a3634dc3292 | [log] [tgz] |
|---|---|---|
| author | Yu Ping Hu <yph@google.com> | Tue Oct 08 19:14:47 2013 -0700 |
| committer | Yu Ping Hu <yph@google.com> | Tue Oct 08 19:14:47 2013 -0700 |
| tree | 6536a8e7b1f65856aa5bb6f6927a1d42d669d3b9 | |
| parent | 04f6597dbf5081733a4860c7f2f263ebb93d124e [diff] | |
| parent | bce71a4fee460dc715f1fd8a44392c3aa92552f7 [diff] |
resolved conflicts for merge of bce71a4f to jb-ub-mail-ur11 Change-Id: I2beb41893692c4c54cd4a1f683772fb4027e16d7