commit | 6b78447937268f3368d89c449491f85cb674fd4d | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Sep 29 06:22:31 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 29 06:22:31 2015 +0000 |
tree | c8871314b509ba3306b1fe0b84fea7314f2a5026 | |
parent | b0e65b8b6f85d7a0abb2ff2f4c4187f61f16c47b [diff] | |
parent | c8bb2777413bb241b765a2479d7f41a4fde3bfd2 [diff] |
am c8bb2777: am 89624149: am 442a77b4: am 1004ed31: resolved conflicts for ed0ccb8a to mnc-dev * commit 'c8bb2777413bb241b765a2479d7f41a4fde3bfd2': Improve the color comparison