am 8ea4fe7a: (-s ours) am 27d5c392: Import translations. DO NOT MERGE

* commit '8ea4fe7ae5ecb320ac065ee8dc3b8e8e40612a42':
  Import translations. DO NOT MERGE
am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev

* commit 'b96ebf9eed3df26e523055fde98913507e6b1a8a':
  Load the avatar icon if it's not yet in the activity view
am 5675f50c: am b96ebf9e: Merge "Load the avatar icon if it\'s not yet in the activity view" into jb-mr2-dev

* commit '5675f50cede90921c4a73cd94d191e39820a24d5':
  Load the avatar icon if it's not yet in the activity view
merge in jb-mr2-release history after reset to jb-mr2-dev
No back icon in action bar of APN Settings

When entering the APN menu, the actionbar is missing a back
icon allowing the user to go back to the previous pane.

Added parentActivityName in ApnSettings, to enable action
bar back icon.

Change-Id: Iee8bb420f47c0e2c0d9a43739f534466abba30db
merge in master-release history after reset to master
Reconcile with jb-mr2-release - do not merge

Change-Id: I82e5359280f8eeb68b9ef61dc4acb3804d8f9106
am d82fa081: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'd82fa081f96985ceef99f523a83e2bb365b949b1':
Merge "No back icon in action bar of APN Settings"
Import translations. DO NOT MERGE

Change-Id: Ic02fef38ac538c74b0ae6fc5262ca2729b6b675d
Auto-generated-cl: translation import
Merge "Single volume control when config_useMasterVolume is true"
Merge "Import translations. DO NOT MERGE"
Add wake lock app ops to UI.

Change-Id: Id2f23acee08fa2830d3edc30a70abf06226ae4eb
Disable On/OFF switch before action

Bug: 8715336

Change-Id: I3d4b05ae9dfe109af0b9b06340d52004b73ad0f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
am f88e6e5a: Don\'t mutate all instances of app icons in Settings

* commit 'f88e6e5ae6a5a31d47677dcbd9be2b26c6615136':
  Don't mutate all instances of app icons in Settings
am 738c373f: am f88e6e5a: Don\'t mutate all instances of app icons in Settings

* commit '738c373f3a27f30d631881c1633cca343e512e8f':
  Don't mutate all instances of app icons in Settings
Merge "Add wake lock app ops to UI."
am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit '4abe488a5f18d04513b294dce1f7f63d0c9cf3a0':
  No back icon in action bar of APN Settings
Merge "Disable On/OFF switch before action"
am b514a95c: am 4abe488a: Merge "No back icon in action bar of APN Settings"

* commit 'b514a95ce7009a61532f00d4ac5ab73861d2b327':
  No back icon in action bar of APN Settings