Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
267,260 Commits 3 Branches 0 Tags
dfd2e37b01596090c50deacba202fa776fe2a2cd
Commit Graph

2 Commits

Author SHA1 Message Date
Aurimas Liutikas
bfc3cfdec5 Remove duplicate the from AppBar documentation. 
Bug:
https://code.google.com/p/android/issues/detail?id=187156

Change-Id: I5ee5e93b5e5b004f49e860047e4e2610b44e81d9
 2016-06-03 14:39:10 -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