| commit | 1d755aaa7b40254d4ebb40d5b970e8f17a0de0c0 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Dec 06 17:31:38 2013 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Fri Dec 06 17:31:38 2013 +0000 |
| tree | 19af6c04823f88a3f40fb2d6965b86d8184800ec | |
| parent | 5e398801fd400cf21f2fab425975817e2f1c32f1 [diff] | |
| parent | 6835cbf9327336180f440a16bc8c8c909f8a2d07 [diff] |
resolved conflicts for merge of 6835cbf9 to master Change-Id: I21593edf5f597bc79ff91b756bdaf6921b05cba7