| 4ee553a06e6d9800123bb9463e77bc8554599ef2 |
|
11-May-2018 |
Yigit Boyar <yboyar@google.com> |
resolve merge conflicts of 8c7ba17f0a8d862f2de744e5bf5879a7e175927d to pi-preview1-androidx-dev
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8e651d666173fec59d64ec722b18572d6f28da91
|
| fbdf0efb750162aa24df0f1a24c8420f1c780ac7 |
|
26-Apr-2018 |
Aurimas Liutikas <aurimas@google.com> |
Merge app-toolkit build into support library.
Test: ./gradlew buildOnServer
Change-Id: Id654438ed5726026cb3bec6047785bb0c67f158a
Merged-In: Id654438ed5726026cb3bec6047785bb0c67f158a
/frameworks/support/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/JournalDbPostMigrationTest.java
|
| beda5774013b4e2ef1e2d445b867f7ede5603d42 |
|
25-Apr-2018 |
Yigit Boyar <yboyar@google.com> |
resolve merge conflicts of e04ae0342b521502855e61fe70eb3078e9380d4f to pi-preview1-androidx-dev
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I26585d4395ce0ee524fa4338423d3a124cdec45c
|