Jack Wang 2c13b9d155 am e0cadd7c: Merge change Iffbb6e55 into eclair ...

Merge commit 'e0cadd7cd811a674df62279dec00d17678b2c501' into eclair-plus-aosp

* commit 'e0cadd7cd811a674df62279dec00d17678b2c501':
  Make perf metrics collection & output via instrumentation simpler

2009-11-16 15:25:01 -08:00

..

accessibilityservice

eclair snapshot

2009-11-13 13:53:39 -08:00

accounts

fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange

2009-11-13 16:21:52 -08:00

annotation

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

app

merge from eclair

2009-11-15 12:06:23 -08:00

appwidget

eclair snapshot

2009-11-13 13:53:39 -08:00

backup

eclair snapshot

2009-11-13 13:53:39 -08:00

bluetooth

eclair snapshot

2009-11-13 13:53:39 -08:00

content

merge from open-source master

2009-11-15 14:03:15 -08:00

database

eclair snapshot

2009-11-13 13:53:39 -08:00

ddm

donut snapshot

2009-05-20 11:28:04 -07:00

debug

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

emoji

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

gesture

eclair snapshot

2009-11-13 13:53:39 -08:00

hardware

eclair snapshot

2009-11-13 13:53:39 -08:00

inputmethodservice

eclair snapshot

2009-11-13 13:53:39 -08:00

net

merge from eclair

2009-11-15 12:06:23 -08:00

os

Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager

2009-11-13 17:40:38 -05:00

pim

eclair snapshot

2009-11-13 13:53:39 -08:00

preference

eclair snapshot

2009-11-13 13:53:39 -08:00

provider

eclair snapshot

2009-11-13 13:53:39 -08:00

security

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

server

eclair snapshot

2009-11-13 13:53:39 -08:00

service/wallpaper

eclair snapshot

2009-11-13 13:53:39 -08:00

speech

eclair snapshot

2009-11-13 13:53:39 -08:00

test

eclair snapshot

2009-11-13 13:53:39 -08:00

text

merge from eclair

2009-11-15 12:06:23 -08:00

util

eclair snapshot

2009-11-13 13:53:39 -08:00

view

eclair snapshot

2009-11-13 13:53:39 -08:00

webkit

eclair snapshot

2009-11-13 13:53:39 -08:00

widget

am 1162fd77: Let RemoteViews nest children, allow ViewFlipper.

2009-11-16 14:38:29 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00