Dmitri Plotnikov 68b4480961 am c1ddb155: am 483a599c: Merge change 25954 into eclair ...

Merge commit 'c1ddb155b86a916b5e0c712493949c582ab495c2'

* commit 'c1ddb155b86a916b5e0c712493949c582ab495c2':
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.

2009-09-21 10:14:24 -07:00

..

config

donut snapshot

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

java

am c1ddb155: am 483a599c: Merge change 25954 into eclair

2009-09-21 10:14:24 -07:00

jni

am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API.

2009-09-20 17:18:03 -07:00

res

am 00de43e0: am ca488232: Merge change 26104 into eclair

2009-09-20 20:36:25 -07:00