[automerger skipped] Fixed ApplicationDetails carets. Fixed ExtraSettingsPreferenceController am: f96d9f0a35 am: 13758371cc -s ours
am skip reason: skipped by user jianyliu

Change-Id: I85ec68b40e940dadcd0c07d7212214c2decfa706
tree: ffd526eadf84f63fcc4dd04d3807b9fc4733b16d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg