| commit | 6e6a9b4b54ecf4b5645aedf89ff02241ec49ad1f | [log] [tgz] |
|---|---|---|
| author | Winson <winsonc@google.com> | Tue Oct 13 17:52:17 2015 -0700 |
| committer | Winson <winsonc@google.com> | Tue Oct 13 17:52:17 2015 -0700 |
| tree | a902049e1d0bd897ab2bd1224248679e2c130d03 | |
| parent | be424b2c32a878608411bc0748bc88300046cc27 [diff] | |
| parent | e9f27273855d50b54b654ef3a3056136e3f2668b [diff] |
resolved conflicts for e9f27273 to ub-launcher3-master Change-Id: I96b062c3309eadf4d41a5f00ea74740bab78b358