Change-Id: I4aa308a3b417d6bdce50567fb66c7119b048140a

- was missing another pass to update-api

Change-Id: Idd7e8364d475b41d0f517b6a06c4a79f31997ff2

BUG=6035422

Change-Id: I8586be0085b36767289e1f634111c0ff076cec3c

* commit '0f9e4bc5':
  Fix hybrid build

* commit 'ad5789c6':
  Fix hybrid build

* commit 'c70e89e2':
  Fix hybrid build

Change-Id: Ieef556473e1878d1319f9844fb0bbb974637999e

related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93

am 8167faa0: am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit '8167faa0':
  docs: change markup for "new" tags to avoid the new tags wraping solo

am 2449b2eb: am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit '2449b2eb':
  docs: change markup for "new" tags to avoid the new tags wraping solo

Some views (such as ImageView and TextView) handle non-opaque alpha
values directly. This was originally an optimization, but we can handle it faster
in many cases without this optimization when DisplayList properties are enabled.
Basically, if a view has non-overlapping rendering, we set the alpha value directly
on the renderer (the equivalent of setting it on the Paint object) and draw each
primitive with that alpha value. Doing it this way avoids re-creating DisplayLists
while getting the same speedup that onSetAlpha() used to get pre-DisplayList properties.

Change-Id: I0f7827f075d3b35093a882d4adbb300a1063c288

am 0687c830: Merge "docs: change markup for "new" tags to avoid the new tags wraping solo" into ics-mr1

* commit '0687c830':
  docs: change markup for "new" tags to avoid the new tags wraping solo

am ce151065: am 0249e6c4: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit 'ce151065':

Change-Id: If88d3cc173080db101ea5af9dc728653a2176a46

am 59616aa6: am 274fb3c6: am 04a73fb6: Merge "Android Training: Making Your App Location Aware" into ics-mr1

* commit '59616aa6':
  Android Training: Making Your App Location Aware

* commit '0249e6c4':

* commit '274fb3c6':
  Android Training: Making Your App Location Aware

* commit '04a73fb6':
  Android Training: Making Your App Location Aware

* commit '04a73fb6':
  Android Training: Making Your App Location Aware

Bug: 6259150
Change-Id: Ic8b28295a7e97ca2885d074962f73d5f1bf980c6

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da