| commit | a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 09:49:18 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 09:49:18 2014 -0700 |
| tree | 164d3fdc2fa10acd8dac0fc46956aad712ab07cc | |
| parent | 888461c801b531f31b2ef34617d333d781d93010 [diff] | |
| parent | 9c00e6739c3d0a11a714a0f654b893531b0f1c5d [diff] |
resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b