| commit | 4614f5097c66991319576e9adb68a834aae19f9e | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Fri Jun 20 11:46:40 2014 -0700 |
| committer | Ruchi Kandoi <kandoiruchi@google.com> | Fri Jun 20 11:46:40 2014 -0700 |
| tree | 36cc0015befe4ef15938f9321aba884ec3a2e53e | |
| parent | 545b127a7834636fb80fdcca1b293cec711d4a7d [diff] |
resolved conflicts for merge of de7bdc94 to master Change-Id: I6dc10c8220c0984b31a05534b576ca25afdf5383