merge in ics-mr0-release history after reset to ics-mr0
merge in ics-release history after reset to master
Reconcile with ics-mr0-release

Change-Id: I8ec1540b94c648ec188ca4eab41ff3d631e0876b
am 6ca215c4: Reconcile with ics-mr0-release

* commit '6ca215c4870818e6f1fa604f0c623deabb971d41':
am 6ca215c4: Reconcile with ics-mr0-release

* commit '6ca215c4870818e6f1fa604f0c623deabb971d41':
am 736e726a: am 6ca215c4: Reconcile with ics-mr0-release

* commit '736e726aa789c65a708ae6248d400882b2ba9a6d':
Reconcile with ics-mr1-release

Change-Id: Id84f2bf03b35cb1281e27f9a5d3585708db95138
am 6485a03a: Reconcile with ics-mr1-release

* commit '6485a03ab5a44a80fefbdbd6a9605ee589f697d2':
  Fix Resources.getIdentifier usage
  Unregister the NFC callback onPause.
  Check current tab before making active
  Fix black screen bug
  Fix autologin crash by removing cleverness
  Add a tab switcher button to phones
Import revised translations.  DO NOT MERGE

Change-Id: I564e3e59296894a3853ec007d07b4507a1a5bc2b
am 5f25258f: Import revised translations.  DO NOT MERGE

* commit '5f25258f9a0959b103956c4e449c8326d991bff2':
  Import revised translations.  DO NOT MERGE
am 5f25258f: (-s ours) Import revised translations.  DO NOT MERGE

* commit '5f25258f9a0959b103956c4e449c8326d991bff2':
  Import revised translations.  DO NOT MERGE
am d6cfe42d: am 5f25258f: (-s ours) Import revised translations.  DO NOT MERGE

* commit 'd6cfe42d56c23ae0e0704922022c350724b2dd37':
  Import revised translations.  DO NOT MERGE
Add support to minimize the WebView's memory consumption by default

webkit change is c/148241

bug:5522175

Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727
Merge "Add support to minimize the WebView's memory consumption by default" into ics-mr1
am e7c44c28: Merge "Add support to minimize the WebView\'s memory consumption by default" into ics-mr1

* commit 'e7c44c2871ea595c8c3f879f19e8790083dbb84c':
  Add support to minimize the WebView's memory consumption by default
am e7c44c28: Merge "Add support to minimize the WebView\'s memory consumption by default" into ics-mr1

* commit 'e7c44c2871ea595c8c3f879f19e8790083dbb84c':
  Add support to minimize the WebView's memory consumption by default
am 65ae8361: am e7c44c28: Merge "Add support to minimize the WebView\'s memory consumption by default" into ics-mr1

* commit '65ae8361b66f21af61971c56b2b3773665c92528':
  Add support to minimize the WebView's memory consumption by default
Add Monkey protection

    Bug: 5577443

Change-Id: I61f59ec5e65de0b59890804f2fb0eb7ab182326d
merge in ics-mr1-release history after reset to ics-mr1
merge in ics-release history after reset to master