Salvador Martinez 923534f641 resolve merge conflicts of 8ec7028 to master ...

Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630

2016-09-07 10:24:03 -07:00

..

app

resolve merge conflicts of 8ec7028 to master

2016-09-07 10:24:03 -07:00

robotests

Add ObservableDialogFragment to log DialogFragments.

2016-08-25 10:42:50 -07:00

unit

Avoid JUnit4 collision in android-support-test, mockito-target

2016-08-25 19:43:16 +00:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00