| commit | 279ecb40dc687f9078409cca6f05ed324929d269 | [log] [tgz] |
|---|---|---|
| author | Neha Sharma <sharmneha@google.com> | Tue Mar 08 09:36:57 2016 -0800 |
| committer | Neha Sharma <sharmneha@google.com> | Tue Mar 08 09:36:57 2016 -0800 |
| tree | c549f2dd5e542786034e00b1ec0bfdd777f7971c | |
| parent | d66ed5124dd0dbe9b401f2df8fca12d509aa1645 [diff] | |
| parent | 9b1c0e13edc3c3a4aa43d8243abb03f9122d5770 [diff] |
resolve merge conflicts of 9b1c0e13ed to lollipop-cts-dev Change-Id: I8958f6d2c711fb856253cce06398a02c6030bbcd