| commit | 8c64904f61caf03ebb916873c7d03d8a3aca7bfd | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Tue Nov 17 04:17:39 2015 -0800 |
| committer | Rom Lemarchand <romlem@google.com> | Tue Nov 17 04:17:39 2015 -0800 |
| tree | 0c663c88d6483f60cb65d1c80c197fb5546e9bdb | |
| parent | be75de5e7363aae0dbef69c016b60e02bb391ff6 [diff] | |
| parent | 1366cabc3da3c2d3787475c32814ec1437bd2da4 [diff] |
resolve merge conflicts of 1366cabc3d to stage-aosp-master. Change-Id: I5665f3415ed5e6ae683ac1c41cc1a63ae5fff592