Daisuke Miyakawa 6cf8be39cc am 57b09882: Merge "Have a new constant for "vibrate when ringing" setting" into jb-dev ...

* commit '57b098829f5960bc2fd29f0b0917189911b18338':
  Have a new constant for "vibrate when ringing" setting

2012-05-09 10:17:54 -07:00

..

java

am 57b09882: Merge "Have a new constant for "vibrate when ringing" setting" into jb-dev

2012-05-09 10:17:54 -07:00

jni

Merge "Support for changing traces from development settings." into jb-dev

2012-05-08 18:54:58 -07:00

res

Merge "Fix some oddities in ResolverActivity" into jb-dev

2012-05-08 11:27:27 -07:00

tests

am 72e95cfe: Merge "Fix Wifi test" into jb-dev

2012-05-09 01:49:51 -07:00