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

Change-Id: Ibf0948351c21af2fc9db1d1518700c8c7530141e
am 55733e94: Reconcile with ics-mr1-release

* commit '55733e946bf809fa2db311c210c030102659323a':
Import revised translations.  DO NOT MERGE

Change-Id: I74fbf272a1147c44de641881c96ad479f4f96596
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1
am 0970964b: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '0970964be6fd44e4732ff6b099c3fcb0cc7d3881':
  Import revised translations.  DO NOT MERGE
am 5c24edfb: (-s ours) am 0970964b: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '5c24edfb3750b42d6e4605a8388358cd73e879d8':
  Import revised translations.  DO NOT MERGE
am 244c45b9: am 5c24edfb: (-s ours) am 0970964b: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '244c45b9072271c11908c63b91b8c152d78ca897':
  Import revised translations.  DO NOT MERGE
Merge "new kernel prebuilt" into ics-mr1
am edaf25c1: Merge "new kernel prebuilt" into ics-mr1

* commit 'edaf25c16e792676840098166549c500ed483978':
  new kernel prebuilt
tuna: prebuilt kernel

f66ecdf misc: fsa9480: prevent wake_enabled from being overwritten
d9ef165 usb: musb: cleanup not needed initializations of state
eee45e5 ASoC: omap-pcm: change decision to preallocate DMA buffers
7d7f546 OMAP3630+: SmartReflex: fix pointer mismatch calling disable
76ae826 ARM: omap4: fiqdebugger: fix build when disabled
405c9d8 OMAP3630+: SmartReflex: Ensure worker canceled prior to free

Change-Id: I340c8cf28dfa35fdcec6159867b115729655aa92
Signed-off-by: Todd Poynor <toddpoynor@google.com>
am fe1a1c19: tuna: prebuilt kernel

* commit 'fe1a1c199fc155aa87a990310557fe8b276e26d0':
  tuna: prebuilt kernel
am d5bb39f2: am edaf25c1: Merge "new kernel prebuilt" into ics-mr1

* commit 'd5bb39f2910ba5b1342f4e9af030543815340662':
  new kernel prebuilt
am 80580366: am fe1a1c19: tuna: prebuilt kernel

* commit '805803665a7a8ab5a5290b935acfc509c8ee9ea1':
  tuna: prebuilt kernel
am ba4ea241: am d5bb39f2: am edaf25c1: Merge "new kernel prebuilt" into ics-mr1

* commit 'ba4ea2412a655e3b8b6c0a40d6e5a5c71a5c1786':
  new kernel prebuilt
am 3fd43368: am 80580366: am fe1a1c19: tuna: prebuilt kernel

* commit '3fd43368e8b996971ce8320cb559130f9675e63a':
  tuna: prebuilt kernel
Enable user builds to capture bugreports via keycombo

Change-Id: I550b23d1f6c281ed1234db5046e96fd7f5a5cce6
am 9a0cc696: Enable user builds to capture bugreports via keycombo

* commit '9a0cc69665817af7f240ead024c1a359a8aa9160':
  Enable user builds to capture bugreports via keycombo
merge in ics-mr1-release history after reset to ics-mr1