additional info for 4.2 17
Merge branch 'android-17'