| commit | 51cce0ec42a04f94569e8da544b02c888b82b31d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 19:31:25 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Mon May 12 19:31:25 2014 -0700 |
| tree | e9c3761ff25df2b3789075d7d81f010c25f3be10 | |
| parent | 8a70bcef5a724906e3c35c58cb2266ee9c9e1b78 [diff] |
resolve conflicts for merge 5a7b3b65 correctly Change-Id: I832b7ee50002bcd1429bf431cc91f12e60d19f84