| commit | e4c31f3387b6b3a1039400f3790846516020a550 | [log] [tgz] |
|---|---|---|
| author | Todd Kjos <tkjos@google.com> | Wed Nov 18 08:31:03 2015 -0800 |
| committer | Todd Kjos <tkjos@google.com> | Wed Nov 18 08:31:03 2015 -0800 |
| tree | 9be0a32e2861a358ecb0060827b773a5f524d7e7 | |
| parent | 76355e85543f02cdf698ccf399727d2a63508488 [diff] | |
| parent | d0f7b2e088c045036562b2c7c9b9b68b6d52ba82 [diff] |
resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp. Change-Id: I9b07dd8dcb8fc74b658466b8dd47546cefffab1d