diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-10-08 17:41:17 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-10-08 17:41:47 -0700 |
| commit | 679920d8091c0fb10e68667f158b9e18a77689fa (patch) | |
| tree | f1e7942797bbdee9b683d7ef74675be52f860d6c /samples/StackWidget/src/com/example/android/stackwidget/StackWidgetProvider.java | |
| parent | 543a86c17b523b94b0639d490bfbb0e225045456 (diff) | |
| parent | 3992ec5675fcb9496d426a15fdaf75ba76e9636e (diff) | |
Merge commit '3992ec56' into klp-modular-dev
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.
Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
Diffstat (limited to 'samples/StackWidget/src/com/example/android/stackwidget/StackWidgetProvider.java')
0 files changed, 0 insertions, 0 deletions