2 Commits

Author	SHA1	Message	Date
Eric Schmidt	378d112b5a	docs: performance: Reduce APK Sizes ... Bug: 29152053 Change-Id: I5aa4e7d59c32ef5d6897a47263e055358b1c9dda	2016-07-01 15:56:53 -07:00
Trevor Johns	682c24e228	Resolve merge conflicts of a5060ee to nyc-dev ... This undoes the automerger skip which occured in commit e740c84dc3 and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086	2016-04-19 02:03:59 -07:00