| commit | ec1b4df6d2ccfe35c251344b43a29af65c3b56e1 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:40:14 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:40:14 2014 -0700 |
| tree | c43a14fc83418fe6bc5db02299135a227394f061 | |
| parent | 85b751949b3d383494523bb98b016157d76787f3 [diff] | |
| parent | b161d6ba7f85b49e4e19d69bd107d30cdd3c0bc1 [diff] |
resolved conflicts for merge of b161d6ba to jb-mr1.1-dev