| commit | 888461c801b531f31b2ef34617d333d781d93010 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 19:16:26 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 19:16:26 2014 -0700 |
| tree | d6d70b90d219ac0c617d09f449ec51be9c05cdca | |
| parent | 5e8b02dbafc3e097a43230f881bd289e207f7bfe [diff] | |
| parent | 1103ece28c695fc26fcee812870c553dca8d840d [diff] |
resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev Change-Id: I16a4ce0863576cca07b1753f0ad56d6e97015c78