[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 7cadca43f2 -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 0da69330b3 is in history

Change-Id: Ia18edfd8fed3ec197fcacd086c4b7fe2f4b5f47d
tree: 9f44a12ca16a351dfd8ad7369c716ed92622f01f
  1. framework/
  2. OsuLogin/
  3. OWNERS