diff options
| author | Alex Light <allight@google.com> | 2014-08-05 14:25:43 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-05 22:13:29 -0700 |
| commit | 8a0ee34c7047b0b3c0869b0c173a210b40fd3050 (patch) | |
| tree | 68fe1955fbec40890b5eaffe8d17739176464363 /cmds/appwidget/src | |
| parent | a254db60acd7daa9ce6833ad07adbf1645357174 (diff) | |
| download | frameworks_base-8a0ee34c7047b0b3c0869b0c173a210b40fd3050.zip frameworks_base-8a0ee34c7047b0b3c0869b0c173a210b40fd3050.tar.gz frameworks_base-8a0ee34c7047b0b3c0869b0c173a210b40fd3050.tar.bz2 | |
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)
Change-Id: I6cf110d3b7668aa5498529c7e58ef57ddc08c332
Diffstat (limited to 'cmds/appwidget/src')
0 files changed, 0 insertions, 0 deletions