am d55e661e: am 3392102c: (-s ours) am 98691110: (-s ours) am 61adf619: (-s ours) am ea3027fe: (-s ours) am 0532b398: (-s ours) Reconcile with jb-mr2-release - do not merge

Browse Source

* commit 'd55e661e886c4ecc4f44d8d6ee6c3ba072be7925':

...

This commit is contained in:

The Android Open Source Project 2013-10-03 14:54:36 -07:00 committed by Android Git Automerger

parent 599e9481f0 d55e661e88

commit d193881971

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available