diff options
| author | 2012-10-31 09:16:58 -0700 | |
|---|---|---|
| committer | 2012-10-31 09:16:58 -0700 | |
| commit | e2d4cc28d72db0d49e61ed4ceeb878436cafb23a (patch) | |
| tree | 75a8d94a5aed70341c739246b4221ce4e6993d90 /libs/gui/ConsumerBase.cpp | |
| parent | 5b47c5c574d8d3bf8e73ea4fd7a08e0d881d461c (diff) | |
| parent | 4ea5d656db0f5fcc4ae6c792ec83e157a2c1bae8 (diff) | |
| parent | f9218b859144dd2d465e28a2709c845c591d5a4b (diff) | |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d