am edced26f: Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-dev

* commit 'edced26f162b0232338064e569fe651b8c805f93':
  Add ContentValues & CursorWindow to framework.aidl