| commit | d269bf4328b608d43b357adbbe3b25d7136883bf | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Jul 13 11:28:47 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Wed Jul 13 11:28:47 2016 -0700 |
| tree | e2613723b9dbf0062d0d133e828deee6decdad4c | |
| parent | 5aeef066b13f2f975550b5964cc065f2be43aa73 [diff] | |
| parent | 69ed5d9a8306ee0427f378abe85cabfc5c3c1f17 [diff] |
resolve merge conflicts of 69ed5d9 to stage-aosp-master Change-Id: I1e86670dcf4e3187efca4beff673bbc057cbd509