diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-10 23:26:13 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-04-10 23:34:07 +0200 |
| commit | 584a7aa62c54bcbd654a6696d4fbb56e124874e7 (patch) | |
| tree | 085c69d131007c3211b472bb5f0fb02f525a9fcd /docs/html/sdk/api_diff/5/changes | |
| parent | a0b2be85b831394173b210be3879f90d336b4386 (diff) | |
| parent | ff0978fd162d1211007c8345bd1ea641fa2b0e33 (diff) | |
resolved conflicts for merge of ff0978fd to master-lockscreen-dev
Change-Id: I03881da30db8189005d50812e5528ed07cebd437
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions