Merge commit '15feb4defc61c7bded6fdd3ea1c3781f25666275' into kraken
* commit '15feb4defc61c7bded6fdd3ea1c3781f25666275':
Remove code to pass the nonexistant lockprofsample flag to Dalvik.
Merge commit '19275cb5b028c18228674f87ba4cbc98d8520c5e' into froyo-plus-aosp
* commit '19275cb5b028c18228674f87ba4cbc98d8520c5e':
Remove code to pass the nonexistant lockprofsample flag to Dalvik.
Merge commit '19fa6d4586df8ff7897fcc73b2228b431502d58e' into kraken
* commit '19fa6d4586df8ff7897fcc73b2228b431502d58e':
Don't inflate the zoom button controller until we
Merge commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a' into froyo-plus-aosp
* commit '738a0460c5c6b45506f5203b87d62f2ac99a8e7a':
Don't inflate the zoom button controller until we
Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken
* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
Make vCard allow users to refrain image export. Useful when
user toggles BT state.
Bug:2607218
This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.
Change-Id: I611232631b7f67f4a1ea803de0dcf4b749c1d8d5
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp
* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
Make vCard allow users to refrain image export. Useful when
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken
* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
Update the comment which supposed to be checked in
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp
* commit '8f655cb6c836380778545fb13044d97ef57139d6':
Update the comment which supposed to be checked in
Basic implementation of an API for organizing a single activity into separate,
discrete pieces. Currently supports adding and removing fragments, and
performing basic lifecycle callbacks on them.
Change-Id: I6ea8e6bdb04d93f8105c2e983fe9b6532422de34
Merge commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7' into kraken
* commit 'e3ce4c89cc54770f01294adc3c3f052c062098c7':
Remove fixed size restriction on the SurfaceView
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp
* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
Remove fixed size restriction on the SurfaceView
Merge commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a' into kraken
* commit '66fa5cc73dd20e8656c478e95f07798d8e20b44a':
Force redraw in touch_up if there is a move.
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
Merge commit '17e36d233dff7178e60d841a650d9bef5d0af93c' into kraken
* commit '17e36d233dff7178e60d841a650d9bef5d0af93c':
Missed a case to resumeUpdatePicture.
Merge commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp
* commit '3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
Missed a case to resumeUpdatePicture.
bug:1648729
print warning if a requery is attemped on main thread
bug:2459293
browser death because of NoSuchElementException. don't use iterator
to march thru the ArrayList. use old style for() loop.
bug:1609474
don't allow downgrades of databases
other stuff
use LRUcache to maintain statement-cache in SQLiteDatabase
Change-Id: I3a42022162f4dfcc75f7d0cfcad8f20f1d193249