Merge "Merge "resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 152ce74448" into nyc-mr1-dev-plus-aosp

Browse Source

am: 2cbe99f83d

* commit '2cbe99f83d0b2002b62f6f80db346f530a1f06e5':
  Reduced the impact of "synchronized" statements

Change-Id: Id1fd953de0ebacfc515dacbb1e368faf503a2be4

...

This commit is contained in:

Pavlin Radoslavov

2016-05-25 01:57:55 +00:00

committed by android-build-merger

parent 3cea02f3ce 2cbe99f83d

commit e657cda595

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

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

Diff Content Not Available