Go to file
The Android Open Source Project 400bb7ce30 am 79090cb3: merge from open-source master
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken

* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
  Change license for the UUS Information file.
  Remove ProximityAlerts Receiver when last ProximityAlert expires.
2010-05-12 15:06:13 -07:00
awt Add correct copyright headers to multiple files 2010-03-11 18:22:10 -08:00
camera Force sooner/generic/sim to use camera stub only. 2010-05-10 15:04:40 +08:00
cmds keystore: rephrase the comment to make the usage more clear. 2010-03-17 16:31:20 +08:00
common Bug 2673557: rename datamessaging 2010-05-10 19:12:49 -07:00
include Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken 2010-05-12 14:54:42 -07:00
libs Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken 2010-05-12 14:54:42 -07:00
opengl am fb234bbe: merge from open-source master 2010-05-12 12:13:18 -07:00
vpn Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources. 2010-01-29 13:35:51 -08:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE Adding PacketVideo attribution in NOTICE. 2010-05-06 14:15:47 -07:00