am e749c32a: (-s ours) Reconcile with jb-mr1.1-release - do not merge
The Android Open Source Project authored
* commit 'e749c32a':
0d901d05
Name Last commit Last update
res am 1d136862: am 6e7f0eed: am 85756a88: remove padding on table, also lifecycle cleanup.
src/com/android/dreams/phototable remove padding on table, also lifecycle cleanup.
Android.mk remove unused dependencies
AndroidManifest.xml Move the hardwareAccelerated attribute in the tag