| commit | b95475404e70f4f0c7a8d4a6a452439223ffe297 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 16:41:58 2015 -0800 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 16:41:58 2015 -0800 |
| tree | b2b54bb08bd4b4359487c73813417b19827d99a9 | |
| parent | 7de2e066ae0cde64c89bc9754adc5a3c302a6dba [diff] | |
| parent | 20db87702b816c5f861041626e04590a3058fa5a [diff] |
resolved conflicts for merge of 20db8770 to master Change-Id: Ifffcf8e2741ec242d940c3ba81244d4df57642fc