Merge "Clarify doc comment for android.os.Build.VERSION.RELEASE" am: fe79660d1e am: 7c4bcfc298
am: c266a5d5c0

Change-Id: I865b0fc84cff768352780c245a9ed46cf92f0429