| commit | 2fb139e02c1e9d2d7c92acf813445a063e73d94f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 19:01:41 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 19:01:41 2014 -0700 |
| tree | e781df18468b5468a781415fa1546c9b54ec6d33 | |
| parent | f20c9c660edcce0fe90ba5f8464f726dcd51229e [diff] | |
| parent | 9f2f5e776aed6bfcd87be0b7dd6aa9d22af28817 [diff] |
resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c