| commit | 9f00e655db5b2b7c3527c20b60dc816eee6eff1d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:55:56 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:55:56 2014 -0700 |
| tree | 164d3fdc2fa10acd8dac0fc46956aad712ab07cc | |
| parent | c233bb65bc10c20fa74fac55461a35c290cfb5f9 [diff] | |
| parent | ce9e87f7436ab6506b5a2949930ce00cd0bc65f5 [diff] |
resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev Change-Id: I6d3a92e8d3853069c1d8cb3399d6dfcb5b58da83