ignore from open-source master

Change-Id: I872f9d77c448447be12b982d8ce74588e333d51b
am 21a6703d: improvement and fixes for bindings test (DO NOT MERGE)

Merge commit '21a6703d6e00c6b267bce313d52a325ed9ff6e47' into gingerbread-plus-aosp

* commit '21a6703d6e00c6b267bce313d52a325ed9ff6e47':
  improvement and fixes for bindings test (DO NOT MERGE)
am 047f8139: (-s ours) am 21a6703d: improvement and fixes for bindings test (DO NOT MERGE)

Merge commit '047f8139fb5808146f13b013265b37e8405bffd8'

* commit '047f8139fb5808146f13b013265b37e8405bffd8':
  improvement and fixes for bindings test (DO NOT MERGE)
am 91825062: add check for FileNotFoundException

Merge commit '91825062617f361fdf3687811194195678123391' into gingerbread-plus-aosp

* commit '91825062617f361fdf3687811194195678123391':
  add check for FileNotFoundException
am 6cb16461: am 91825062: add check for FileNotFoundException

Merge commit '6cb16461e1524eb3272b4e9440db6c041feacbb3'

* commit '6cb16461e1524eb3272b4e9440db6c041feacbb3':
  add check for FileNotFoundException
Merge "Put the star on a line by itself."
am d5b08528: am 88ec7e48: Import revised translations

Merge commit 'd5b085281b16549f92c64371550449dab20323f2' into gingerbread-plus-aosp

* commit 'd5b085281b16549f92c64371550449dab20323f2':
  Import revised translations
am 88ec7e48: Import revised translations

Merge commit '88ec7e4870391af9a193957222fd6ded16b9c546' into froyo-plus-aosp

* commit '88ec7e4870391af9a193957222fd6ded16b9c546':
  Import revised translations
am 9424765b: am d5b08528: am 88ec7e48: Import revised translations

Merge commit '9424765baf4b851f82708013b7b336cfb882af5e'

* commit '9424765baf4b851f82708013b7b336cfb882af5e':
  Import revised translations
merge from froyo-plus-aosp

Change-Id: I9b650562cac7b29c56204261a285b3a865c0dd9f
am 49f2b2b7: merge from froyo-plus-aosp

Merge commit '49f2b2b7660ec820155859d5919fdb08d0d98187'

* commit '49f2b2b7660ec820155859d5919fdb08d0d98187':
  Replaced deprecated SensorListener with new SensorEventListener
Use the new WebSettings to enable smooth transition
during panning and zooming.
am 6c6d6c7f: emma code coverage filter for Browser

Merge commit '6c6d6c7fb72497f12fa557c4456c518508e6191e' into gingerbread-plus-aosp

* commit '6c6d6c7fb72497f12fa557c4456c518508e6191e':
  emma code coverage filter for Browser
am ee07e9c9: am 6c6d6c7f: emma code coverage filter for Browser

Merge commit 'ee07e9c908cb3aec6faa437dfd7435189229b79b'

* commit 'ee07e9c908cb3aec6faa437dfd7435189229b79b':
  emma code coverage filter for Browser
Refactor find and select dialogs

(This is a work in progress -- assets in particular are not final)

Use common code when showing the select and find dialogs. Both
now use similarly constructed contextual action bars and share
resources where possible. Both share a common base class so
supporting code can communicate with either.

Companion changes in frameworks/base and external/webkit

Change-Id: I62e15afd2730444985f8dbd2472df3cae351f47a
http://b/262451
Merge "Refactor find and select dialogs"
am 98b938b1: Actually remove the subwindow.

Merge commit '98b938b111eee332624a45728959e55f9d982797' into gingerbread-plus-aosp

* commit '98b938b111eee332624a45728959e55f9d982797':
  Actually remove the subwindow.
am 459bc29d: am 98b938b1: Actually remove the subwindow.

Merge commit '459bc29d145e754d93c79d30314cd1d162b3cc61'

* commit '459bc29d145e754d93c79d30314cd1d162b3cc61':
  Actually remove the subwindow.
Update the lock icon when closing a tab.

Bug: 2790724
Change-Id: Ia7431b033bd2b56629457fe38b392504862f26c5
If url hijacking happens on a newly opened child window,
close the child window after switching Activity.

Fix http://b/issue?id=2764723